kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #36067 from st0012/update-generator-for-api-app

Browse source 
Remove action_controller.perform_caching from api app's configs
This commit is contained in:
Rafael França 2019-04-23 14:37:46 -04:00 committed by GitHub
commit 5566b4a636
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
View file

@ -15,9 +15,11 @@ Rails.application.configure do
# Enable/disable caching. By default caching is disabled. # Enable/disable caching. By default caching is disabled.
# Run rails dev:cache to toggle caching. # Run rails dev:cache to toggle caching.
if Rails.root.join('tmp', 'caching-dev.txt').exist? if Rails.root.join('tmp', 'caching-dev.txt').exist?
<%- unless options.api? -%>
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
config.action_controller.enable_fragment_cache_logging = true config.action_controller.enable_fragment_cache_logging = true
<%- end -%>
config.cache_store = :memory_store config.cache_store = :memory_store
config.public_file_server.headers = { config.public_file_server.headers = {
'Cache-Control' => "public, max-age=#{2.days.to_i}" 'Cache-Control' => "public, max-age=#{2.days.to_i}"

2
railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
View file

@ -12,7 +12,9 @@ Rails.application.configure do
# Full error reports are disabled and caching is turned on. # Full error reports are disabled and caching is turned on.
config.consider_all_requests_local = false config.consider_all_requests_local = false
<%- unless options.api? -%>
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
<%- end -%>
# Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
# or in config/master.key. This key is used to decrypt credentials (and other encrypted files). # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).

7
railties/test/generators/api_app_generator_test.rb
View file

@ -50,6 +50,13 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
assert_file "config/application.rb", /config\.api_only = true/ assert_file "config/application.rb", /config\.api_only = true/
assert_file "app/controllers/application_controller.rb", /ActionController::API/ assert_file "app/controllers/application_controller.rb", /ActionController::API/
assert_file "config/environments/development.rb" do |content|
assert_no_match(/action_controller\.perform_caching = true/, content)
end
assert_file "config/environments/production.rb" do |content|
assert_no_match(/action_controller\.perform_caching = true/, content)
end
end end
def test_generator_if_skip_action_cable_is_given def test_generator_if_skip_action_cable_is_given