1 files changed, 19 insertions, 0 deletions
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index 9b2f277f54..b2533e5315 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -33,6 +33,25 @@ class HelperGeneratorTest < GeneratorsTestCase
     assert_match /The name 'AnotherObjectHelperTest' is either already used in your application or reserved/, content
   end
 
+  def test_namespaced_and_not_namespaced_helpers
+    run_generator ["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 "#{destination_root}/app/helpers/products_helper"
+
+    assert_nothing_raised do
+      begin
+        run_generator ["admin::products"]
+      ensure
+        # cleanup
+        Object.send(:remove_const, :ProductsHelper)
+      end
+    end
+  end
+
   protected
 
     def run_generator(args=["admin"])