aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/abstract_controller/base.rb6
-rw-r--r--actionview/lib/action_view/test_case.rb2
2 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index d4317399ed..e90886775e 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -94,7 +94,11 @@ module AbstractController
# ==== Returns
# * <tt>String</tt>
def controller_path
- @controller_path ||= name.sub(/Controller$/, ''.freeze).underscore unless anonymous?
+ @controller_path ||= if anonymous?
+ superclass.controller_path
+ else
+ name.sub(/Controller$/, ''.freeze).underscore
+ end
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 120962b5aa..ec16b0609e 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_writer :controller_path
+ attr_accessor :controller_path
end
def controller_path=(path)