diff options
author | José Valim <jose.valim@gmail.com> | 2009-06-25 10:44:46 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-06-25 10:44:46 +0200 |
commit | eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc (patch) | |
tree | 18fefccf66400752301f80b0394089da24682e3a /railties/test/rails_generator | |
parent | 5337766fa02142c72312ae2d39620e377f6c7155 (diff) | |
download | rails-eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc.tar.gz rails-eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc.tar.bz2 rails-eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc.zip |
Make tests pass again after merge.
Diffstat (limited to 'railties/test/rails_generator')
6 files changed, 7 insertions, 7 deletions
diff --git a/railties/test/rails_generator/rails_controller_generator_test.rb b/railties/test/rails_generator/rails_controller_generator_test.rb index 43fbe972e2..6cbb6bf2bd 100644 --- a/railties/test/rails_generator/rails_controller_generator_test.rb +++ b/railties/test/rails_generator/rails_controller_generator_test.rb @@ -1,4 +1,4 @@ -require 'generators/generator_test_helper' +require 'rails_generator/generator_test_helper' module Admin end diff --git a/railties/test/rails_generator/rails_mailer_generator_test.rb b/railties/test/rails_generator/rails_mailer_generator_test.rb index de61e6736d..f580fe27ab 100644 --- a/railties/test/rails_generator/rails_mailer_generator_test.rb +++ b/railties/test/rails_generator/rails_mailer_generator_test.rb @@ -1,4 +1,4 @@ -require 'generators/generator_test_helper' +require 'rails_generator/generator_test_helper' class RailsMailerGeneratorTest < GeneratorTestCase diff --git a/railties/test/rails_generator/rails_model_generator_test.rb b/railties/test/rails_generator/rails_model_generator_test.rb index aea2abafba..ae3c2e316e 100644 --- a/railties/test/rails_generator/rails_model_generator_test.rb +++ b/railties/test/rails_generator/rails_model_generator_test.rb @@ -1,4 +1,4 @@ -require 'generators/generator_test_helper' +require 'rails_generator/generator_test_helper' class RailsModelGeneratorTest < GeneratorTestCase diff --git a/railties/test/rails_generator/rails_model_subclass_generator_test.rb b/railties/test/rails_generator/rails_model_subclass_generator_test.rb index 30066b5a3c..4f20de6eba 100644 --- a/railties/test/rails_generator/rails_model_subclass_generator_test.rb +++ b/railties/test/rails_generator/rails_model_subclass_generator_test.rb @@ -1,4 +1,4 @@ -require 'generators/generator_test_helper' +require 'rails_generator/generator_test_helper' class RailsModelSubclassGeneratorTest < GeneratorTestCase @@ -12,4 +12,4 @@ class RailsModelSubclassGeneratorTest < GeneratorTestCase def test_model_subclass_must_have_a_parent_class_name assert_raise(Rails::Generator::UsageError) { run_generator('model_subclass', %w(Car)) } end -end
\ No newline at end of file +end diff --git a/railties/test/rails_generator/rails_resource_generator_test.rb b/railties/test/rails_generator/rails_resource_generator_test.rb index 1f5bd0ef1e..b9a432cbff 100644 --- a/railties/test/rails_generator/rails_resource_generator_test.rb +++ b/railties/test/rails_generator/rails_resource_generator_test.rb @@ -1,4 +1,4 @@ -require 'generators/generator_test_helper' +require 'rails_generator/generator_test_helper' class RailsResourceGeneratorTest < GeneratorTestCase def test_resource_generates_resources diff --git a/railties/test/rails_generator/rails_scaffold_generator_test.rb b/railties/test/rails_generator/rails_scaffold_generator_test.rb index 70829a77fd..ffbeff79fb 100644 --- a/railties/test/rails_generator/rails_scaffold_generator_test.rb +++ b/railties/test/rails_generator/rails_scaffold_generator_test.rb @@ -1,4 +1,4 @@ -require 'generators/generator_test_helper' +require 'rails_generator/generator_test_helper' require 'abstract_unit' class RailsScaffoldGeneratorTest < GeneratorTestCase |