3 files changed, 7 insertions, 15 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index ab050fc246..68c3829515 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -317,9 +317,9 @@ task default: :test
         @modules ||= namespaced_name.camelize.split("::")
       end
 
-      def wrap_in_modules(content)
-        content = "#{content}".strip.gsub(/\W$\n/, '')
-        modules.reverse.inject(content) do |content, mod|
+      def wrap_in_modules(unwrapped_code)
+        unwrapped_code = "#{unwrapped_code}".strip.gsub(/\W$\n/, '')
+        modules.reverse.inject(unwrapped_code) do |content, mod|
           str = "module #{mod}\n"
           str += content.lines.map { |line| "  #{line}" }.join
           str += content.present? ? "\nend" : "end"
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index 4199e00b0d..18a26fde05 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -2,16 +2,6 @@ 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
   tests Rails::Generators::ScaffoldControllerGenerator
@@ -59,11 +49,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
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 9c49766a2f..cc9ad82690 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -197,7 +197,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     end
     assert_match(/run  bundle install/, result)
     assert_match(/Using bukkits \(?0\.0\.1\)?/, result)
-    assert_match(/Your bundle is complete/, result)
+    assert_match(/Bundle complete!/, result)
     assert_equal 1, result.scan("Your bundle is complete").size
   end