diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-04-22 17:21:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 17:21:41 -0400 |
| commit | cc834db1d0815744cfa173813c05d928e008e167 (patch) | |
| tree | b49b6f204fb3f2f4cb612ba7fd77e8f1ff39ff83 | |
| parent | 216ef01d149e379478b67f517d7b970055339085 (diff) | |
| parent | b62b038d9aa3593fb2be94a5e187c4f531e67834 (diff) | |
| download | rails-cc834db1d0815744cfa173813c05d928e008e167.tar.gz rails-cc834db1d0815744cfa173813c05d928e008e167.tar.bz2 rails-cc834db1d0815744cfa173813c05d928e008e167.zip | |
Merge pull request #36058 from rails/revert-36038-fix-35602
Revert "Include Caching module for ActionController::API"
| -rw-r--r-- | actionpack/lib/action_controller/api.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb index 02ab3bf570..c276ee57c0 100644 --- a/actionpack/lib/action_controller/api.rb +++ b/actionpack/lib/action_controller/api.rb @@ -117,7 +117,6 @@ 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 0ddf299875..62d9b1c813 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -2216,19 +2216,6 @@ 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 |