mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #36067 from st0012/update-generator-for-api-app
Remove action_controller.perform_caching from api app's configs
This commit is contained in:
commit
5566b4a636
3 changed files with 11 additions and 0 deletions
|
@ -15,9 +15,11 @@ Rails.application.configure do
|
|||
# Enable/disable caching. By default caching is disabled.
|
||||
# Run rails dev:cache to toggle caching.
|
||||
if Rails.root.join('tmp', 'caching-dev.txt').exist?
|
||||
<%- unless options.api? -%>
|
||||
config.action_controller.perform_caching = true
|
||||
config.action_controller.enable_fragment_cache_logging = true
|
||||
|
||||
<%- end -%>
|
||||
config.cache_store = :memory_store
|
||||
config.public_file_server.headers = {
|
||||
'Cache-Control' => "public, max-age=#{2.days.to_i}"
|
||||
|
|
|
@ -12,7 +12,9 @@ Rails.application.configure do
|
|||
|
||||
# Full error reports are disabled and caching is turned on.
|
||||
config.consider_all_requests_local = false
|
||||
<%- unless options.api? -%>
|
||||
config.action_controller.perform_caching = true
|
||||
<%- end -%>
|
||||
|
||||
# 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).
|
||||
|
|
|
@ -50,6 +50,13 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
|
|||
|
||||
assert_file "config/application.rb", /config\.api_only = true/
|
||||
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
|
||||
|
||||
def test_generator_if_skip_action_cable_is_given
|
||||
|
|
Loading…
Reference in a new issue