aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/api.rb1
-rw-r--r--railties/test/application/configuration_test.rb13
2 files changed, 14 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb
index c276ee57c0..02ab3bf570 100644
--- a/actionpack/lib/action_controller/api.rb
+++ b/actionpack/lib/action_controller/api.rb
@@ -117,6 +117,7 @@ module ActionController
ApiRendering,
Renderers::All,
ConditionalGet,
+ Caching,
BasicImplicitRender,
StrongParameters,
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 62d9b1c813..0ddf299875 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -2216,6 +2216,19 @@ module ApplicationTests
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