1 files changed, 15 insertions, 21 deletions
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index 4199e00b0d..291f5e06c3 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -1,16 +1,5 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
-require 'mocha/setup' # FIXME: stop using mocha
-
-# Mock out what we need from AR::Base.
-module ActiveRecord
-  class Base
-    class << self
-      attr_accessor :pluralize_table_names
-    end
-    self.pluralize_table_names = true
-  end
-end
 
 class NamedBaseTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
@@ -59,11 +48,13 @@ class NamedBaseTest < Rails::Generators::TestCase
   end
 
   def test_named_generator_attributes_without_pluralized
+    original_pluralize_table_names = ActiveRecord::Base.pluralize_table_names
     ActiveRecord::Base.pluralize_table_names = false
+
     g = generator ['admin/foo']
     assert_name g, 'admin_foo', :table_name
   ensure
-    ActiveRecord::Base.pluralize_table_names = true
+    ActiveRecord::Base.pluralize_table_names = original_pluralize_table_names
   end
 
   def test_scaffold_plural_names
@@ -88,10 +79,13 @@ class NamedBaseTest < Rails::Generators::TestCase
 
   def test_application_name
     g = generator ['Admin::Foo']
-    Rails.stubs(:application).returns(Object.new)
-    assert_name g, "object", :application_name
-    Rails.stubs(:application).returns(nil)
-    assert_name g, "application", :application_name
+    Rails.stub(:application, Object.new) do
+      assert_name g, "object", :application_name
+    end
+
+    Rails.stub(:application, nil) do
+      assert_name g, "application", :application_name
+    end
   end
 
   def test_index_helper
@@ -111,11 +105,11 @@ class NamedBaseTest < Rails::Generators::TestCase
 
   def test_hide_namespace
     g = generator ['Hidden']
-    g.class.stubs(:namespace).returns('hidden')
-
-    assert !Rails::Generators.hidden_namespaces.include?('hidden')
-    g.class.hide!
-    assert Rails::Generators.hidden_namespaces.include?('hidden')
+    g.class.stub(:namespace, 'hidden') do
+      assert !Rails::Generators.hidden_namespaces.include?('hidden')
+      g.class.hide!
+      assert Rails::Generators.hidden_namespaces.include?('hidden')
+    end
   end
 
   def test_scaffold_plural_names_with_model_name_option