diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-05-20 23:28:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-05-20 23:28:00 -0300 |
| commit | e3b239cc1a8626c24f4a642e9261bad4a97c6cac (patch) | |
| tree | b2333019a85b992fdc2a1b7e5ee73e5e46325c25 | |
| parent | d0c257f5daadc2b3451f0b8c775f38c48c56eaad (diff) | |
| download | rails-e3b239cc1a8626c24f4a642e9261bad4a97c6cac.tar.gz rails-e3b239cc1a8626c24f4a642e9261bad4a97c6cac.tar.bz2 rails-e3b239cc1a8626c24f4a642e9261bad4a97c6cac.zip | |
Revert "Make sure the cache is always populated"
This reverts commit 0ce7eae7418f1b9bb06b351c1f26d50c3674c0d0.
Tests were broken https://travis-ci.org/rails/rails/jobs/131850726#L520
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 6 | ||||
| -rw-r--r-- | actionview/lib/action_view/test_case.rb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index e90886775e..d4317399ed 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -94,11 +94,7 @@ module AbstractController # ==== Returns # * <tt>String</tt> def controller_path - @controller_path ||= if anonymous? - superclass.controller_path - else - name.sub(/Controller$/, ''.freeze).underscore - end + @controller_path ||= name.sub(/Controller$/, ''.freeze).underscore unless anonymous? end # Refresh the cached action_methods when a new action_method is added. diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb index ec16b0609e..120962b5aa 100644 --- a/actionview/lib/action_view/test_case.rb +++ b/actionview/lib/action_view/test_case.rb @@ -14,7 +14,7 @@ module ActionView attr_accessor :request, :response, :params class << self - attr_accessor :controller_path + attr_writer :controller_path end def controller_path=(path) |