Add test to ensure setting config.generators.http_only actually disables the generator options

[Carlos Antonio da Silva & Santiago Pastorino]

2 files changed, 15 insertions, 2 deletions

diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 7ebb68152f..15a71260c1 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -126,7 +126,20 @@ module ApplicationTests
       end
     end
 
-    test "http only allow overriding generators on initialization" do
+    test "http only disables options from generators" do
+      add_to_config <<-RUBY
+        config.generators.http_only!
+      RUBY
+
+      # Initialize the application
+      require "#{app_path}/config/environment"
+      Rails.application.load_generators
+
+      assert !Rails::Generators.options[:rails][:template_engine],
+        "http only should have disabled generator options"
+    end
+
+    test "http only allow overriding generators options" do
       add_to_config <<-RUBY
         config.generators.helper = true
         config.generators.http_only!
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index e6f85918f6..43f86f40e4 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -52,7 +52,7 @@ module ApplicationTests
       ], middleware
     end
 
-    test "api middleware stack" do
+    test "http only middleware stack" do
       add_to_config "config.middleware.http_only!"
       add_to_config "config.force_ssl = true"
       add_to_config "config.action_dispatch.x_sendfile_header = 'X-Sendfile'"