More tests for rails generators and lookup.

2 files changed, 5 insertions, 5 deletions

diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 7f22197a54..2ccedf814d 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -1,9 +1,6 @@
 require 'test/unit'
 require 'fileutils'
 
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
-require 'generators'
-
 fixtures = File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixtures'))
 if defined?(RAILS_ROOT)
   RAILS_ROOT.replace fixtures
@@ -11,6 +8,9 @@ else
   RAILS_ROOT = fixtures
 end
 
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
+require 'generators'
+
 class GeneratorsTestCase < Test::Unit::TestCase
   include FileUtils
 
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index d076244abd..30fc837834 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -107,8 +107,8 @@ class ModelGeneratorTest < GeneratorsTestCase
   end
 
   def test_fixture_is_skipped_if_fixture_replacement_is_given
-    content = run_generator ["account", "-r", "fixjour"]
-    assert_match /Could not find and invoke 'fixjour'/, content
+    content = run_generator ["account", "-r", "factory_girl"]
+    assert_match /Could not find and invoke 'factory_girl'/, content
     assert_no_file "test/fixtures/accounts.yml"
   end