3 files changed, 62 insertions, 1 deletions
diff --git a/railties/test/generators/rails_controller_generator_test.rb b/railties/test/generators/rails_controller_generator_test.rb
index 0090d21b85..8304fb5a01 100644
--- a/railties/test/generators/rails_controller_generator_test.rb
+++ b/railties/test/generators/rails_controller_generator_test.rb
@@ -17,4 +17,23 @@ class RailsControllerGeneratorTest < GeneratorTestCase
     assert_generated_functional_test_for "admin::products"
     assert_generated_helper_for "admin::products"
   end
+
+  def test_controller_generates_namespaced_and_not_namespaced_controllers
+      run_generator('controller', %w(products))
+
+      # We have to require the generated helper to show the problem because
+      # the test helpers just check for generated files and contents but
+      # do not actually load them. But they have to be loaded (as in a real environment)
+      # to make the second generator run fail
+      require "#{RAILS_ROOT}/app/helpers/products_helper"
+
+      assert_nothing_raised do
+        begin
+          run_generator('controller', %w(admin::products))
+        ensure
+          # cleanup
+          Object.send(:remove_const, :ProductsHelper)
+        end
+      end
+  end
 end
diff --git a/railties/test/generators/rails_scaffold_generator_test.rb b/railties/test/generators/rails_scaffold_generator_test.rb
index 220f9e372e..de6b38dafe 100644
--- a/railties/test/generators/rails_scaffold_generator_test.rb
+++ b/railties/test/generators/rails_scaffold_generator_test.rb
@@ -1,4 +1,5 @@
 require 'generators/generator_test_helper'
+require 'abstract_unit'
 
 class RailsScaffoldGeneratorTest < GeneratorTestCase
   
@@ -104,4 +105,45 @@ class RailsScaffoldGeneratorTest < GeneratorTestCase
     assert_added_route_for :products
   end
 
+  uses_mocha("scaffold_force_plural_names") do
+    def test_scaffolded_plural_names
+      Rails::Generator::Base.logger.expects(:warning)
+      g = Rails::Generator::Base.instance('scaffold', %w(ProductLines))
+      assert_equal "ProductLines", g.controller_name
+      assert_equal "ProductLines", g.controller_class_name
+      assert_equal "ProductLine", g.controller_singular_name
+      assert_equal "product_lines", g.controller_plural_name
+      assert_equal "product_lines", g.controller_file_name
+      assert_equal "product_lines", g.controller_table_name
+    end
+  end
+
+  def test_scaffold_plural_model_name_without_force_plural_generates_singular_model
+    run_generator('scaffold', %w(Products name:string))
+
+    assert_generated_model_for :product
+    assert_generated_functional_test_for :products
+    assert_generated_unit_test_for :product
+    assert_generated_fixtures_for :products
+    assert_generated_helper_for :products
+    assert_generated_stylesheet :scaffold
+    assert_generated_views_for :products, "index.html.erb","new.html.erb","edit.html.erb","show.html.erb"
+    assert_skipped_migration :create_products
+    assert_added_route_for :products
+  end
+
+  def test_scaffold_plural_model_name_with_force_plural_forces_plural_model
+    run_generator('scaffold', %w(Products name:string --force-plural))
+
+    assert_generated_model_for :products
+    assert_generated_functional_test_for :products
+    assert_generated_unit_test_for :products
+    assert_generated_fixtures_for :products
+    assert_generated_helper_for :products
+    assert_generated_stylesheet :scaffold
+    assert_generated_views_for :products, "index.html.erb","new.html.erb","edit.html.erb","show.html.erb"
+    assert_skipped_migration :create_products
+    assert_added_route_for :products
+  end
+
 end
diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb
index e5fc0926eb..f429bae15c 100644
--- a/railties/test/plugin_loader_test.rb
+++ b/railties/test/plugin_loader_test.rb
@@ -94,7 +94,7 @@ uses_mocha "Plugin Loader Tests" do
 
     def test_should_add_plugin_load_paths_to_global_LOAD_PATH_array
       only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
-      stubbed_application_lib_index_in_LOAD_PATHS = 5
+      stubbed_application_lib_index_in_LOAD_PATHS = 4
       @loader.stubs(:application_lib_index).returns(stubbed_application_lib_index_in_LOAD_PATHS)
 
       @loader.add_plugin_load_paths