Merge pull request #36038 from st0012/fix-35602

Include Caching module for ActionController::API
rails · Apr 22, 2019 · 216ef01 · 216ef01
2 parents 45a6cf3 + 7814d1c
commit 216ef01
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb
@@ -117,6 +117,7 @@ def self.without_modules(*modules)
       ApiRendering,
       Renderers::All,
       ConditionalGet,
+      Caching,
       BasicImplicitRender,
       StrongParameters,
 

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
@@ -2216,6 +2216,19 @@ class Post < ActiveRecord::Base
       assert_equal :default, Rails.configuration.debug_exception_response_format
     end
 
+    test "action_controller.cache_store works for api_only app as well" do
+      add_to_config <<-RUBY
+        config.api_only = true
+        config.action_controller.cache_store = :memory_store
+      RUBY
+
+      app "development"
+
+      api_controller = Class.new(ActionController::API)
+
+      assert_equal(api_controller.cache_store.class, ActiveSupport::Cache::MemoryStore)
+    end
+
     test "controller force_ssl declaration can be used even if session_store is disabled" do
       make_basic_app do |application|
         application.config.session_store :disabled