Merge pull request #28013 from iguchi1124/fix-missing-namespace-wrapper

Add missing module namespacing wrapper

2 files changed, 8 insertions, 2 deletions

diff --git a/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb
index dea7e22196..118e0f1271 100644
--- a/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb
+++ b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb
@@ -1,7 +1,9 @@
 require 'test_helper'
 
+<% module_namespacing do -%>
 class <%= class_name %>Test < ActionDispatch::IntegrationTest
   # test "the truth" do
   #   assert true
   # end
 end
+<% end -%>
diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb
index 8bcc02440a..9358b63bd4 100644
--- a/railties/test/generators/integration_test_generator_test.rb
+++ b/railties/test/generators/integration_test_generator_test.rb
@@ -3,10 +3,14 @@ require "rails/generators/rails/integration_test/integration_test_generator"
 
 class IntegrationTestGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
-  arguments %w(integration)
 
   def test_integration_test_skeleton_is_created
-    run_generator
+    run_generator %w(integration)
     assert_file "test/integration/integration_test.rb", /class IntegrationTest < ActionDispatch::IntegrationTest/
   end
+
+  def test_namespaced_integration_test_skeleton_is_created
+    run_generator %w(iguchi/integration)
+    assert_file "test/integration/iguchi/integration_test.rb", /class Iguchi::IntegrationTest < ActionDispatch::IntegrationTest/
+  end
 end