Fix Railties tests that were order dependent

1 files changed, 10 insertions, 0 deletions

diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index b5765c391e..127e059bf1 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -152,6 +152,8 @@ class GeneratorsTest < Rails::Generators::TestCase
     klass = Rails::Generators.find_by_namespace(:plugin, :remarkable)
     assert klass
     assert_equal "test_unit:plugin", klass.namespace
+  ensure
+    Rails::Generators.fallbacks.delete(:remarkable)
   end
 
   def test_fallbacks_for_generators_on_find_by_namespace_with_context
@@ -159,18 +161,26 @@ class GeneratorsTest < Rails::Generators::TestCase
     klass = Rails::Generators.find_by_namespace(:remarkable, :rails, :plugin)
     assert klass
     assert_equal "test_unit:plugin", klass.namespace
+  ensure
+    Rails::Generators.fallbacks.delete(:remarkable)
   end
 
   def test_fallbacks_for_generators_on_invoke
     Rails::Generators.fallbacks[:shoulda] = :test_unit
     TestUnit::Generators::ModelGenerator.expects(:start).with(["Account"], {})
     Rails::Generators.invoke "shoulda:model", ["Account"]
+  ensure
+    Rails::Generators.fallbacks.delete(:shoulda)
   end
 
   def test_nested_fallbacks_for_generators
+    Rails::Generators.fallbacks[:shoulda] = :test_unit
     Rails::Generators.fallbacks[:super_shoulda] = :shoulda
     TestUnit::Generators::ModelGenerator.expects(:start).with(["Account"], {})
     Rails::Generators.invoke "super_shoulda:model", ["Account"]
+  ensure
+    Rails::Generators.fallbacks.delete(:shoulda)
+    Rails::Generators.fallbacks.delete(:super_shoulda)
   end
 
   def test_developer_options_are_overwritten_by_user_options