<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -17,4 +17,23 @@ class RailsControllerGeneratorTest &lt; GeneratorTestCase
     assert_generated_functional_test_for &quot;admin::products&quot;
     assert_generated_helper_for &quot;admin::products&quot;
   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 &quot;#{RAILS_ROOT}/app/helpers/products_helper&quot;
+
+      assert_nothing_raised do
+        begin
+          run_generator('controller', %w(admin::products))
+        ensure
+          # cleanup
+          Object.send(:remove_const, :ProductsHelper)
+        end
+      end
+  end
 end</diff>
      <filename>railties/test/generators/rails_controller_generator_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f522a89d6447da306778b67353adaf679c26bbd1</id>
    </parent>
  </parents>
  <author>
    <name>Joshua Peek</name>
    <email>josh@joshpeek.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/c00baf496ef40d09962aabcb63d6d319cb8a0584</url>
  <id>c00baf496ef40d09962aabcb63d6d319cb8a0584</id>
  <committed-date>2008-07-11T10:09:25-07:00</committed-date>
  <authored-date>2008-07-11T10:09:25-07:00</authored-date>
  <message>Added tests to show that 2d372d7 breaks old generator behavior (#545 state:resolved)</message>
  <tree>203102125f42826c9cf9da04f64ebd35233661ec</tree>
  <committer>
    <name>Joshua Peek</name>
    <email>josh@joshpeek.com</email>
  </committer>
</commit>
