Remove config.public_file_server.enabled from generators

Remove the option `config.public_file_server.enabled` from the generators for all environments, as the value is the same in all environments. Co-authored-by: Jonathan Hefner <jonathan@hefner.pro>
vipulnsward · Nov 3, 2023 · f0a03bd · f0a03bd
1 parent 2c2ccec
commit f0a03bd
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 5 deletions.
diff --git a/actionmailbox/test/dummy/config/environments/test.rb b/actionmailbox/test/dummy/config/environments/test.rb
@@ -18,7 +18,6 @@
   config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
-  config.public_file_server.enabled = true
   config.public_file_server.headers = {
     "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }

diff --git a/actiontext/test/dummy/config/environments/test.rb b/actiontext/test/dummy/config/environments/test.rb
@@ -18,7 +18,6 @@
   config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
-  config.public_file_server.enabled = true
   config.public_file_server.headers = {
     "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }

diff --git a/activestorage/test/dummy/config/environments/test.rb b/activestorage/test/dummy/config/environments/test.rb
@@ -18,7 +18,6 @@
   config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
-  config.public_file_server.enabled = true
   config.public_file_server.headers = {
     "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -37,4 +37,9 @@
 
     *Steve Polito*
 
+*   Remove the option `config.public_file_server.enabled` from the generators
+    for all environments, as the value is the same in all environments.
+
+    *Adrian Hirt*
+
 Please check [7-1-stable](https://github.com/rails/rails/blob/7-1-stable/railties/CHANGELOG.md) for previous changes.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -18,7 +18,6 @@ Rails.application.configure do
   config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
-  config.public_file_server.enabled = true
   config.public_file_server.headers = {
     "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
@@ -250,7 +250,6 @@ class User < ActiveRecord::Base; raise 'should not be reached'; end
     test "assets do not require any assets group gem when manifest file is present" do
       app_file "app/assets/javascripts/application.js", "alert();"
       app_file "app/assets/config/manifest.js", "//= link application.js"
-      add_to_env_config "production", "config.public_file_server.enabled = true"
 
       precompile! RAILS_ENV: "production"
 

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
@@ -695,6 +695,24 @@ def assert_utf8
       assert_equal Pathname.new(app_path).join("somewhere"), Rails.public_path
     end
 
+    test "In development mode, config.public_file_server.enabled is on by default" do
+      restore_default_config
+
+      with_rails_env "development" do
+        app "development"
+        assert app.config.public_file_server.enabled
+      end
+    end
+
+    test "In test mode, config.public_file_server.enabled is on by default" do
+      restore_default_config
+
+      with_rails_env "test" do
+        app "test"
+        assert app.config.public_file_server.enabled
+      end
+    end
+
     test "In production mode, config.public_file_server.enabled is on by default" do
       restore_default_config