aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-08-13 18:31:58 +0000
committerRick Olson <technoweenie@gmail.com>2006-08-13 18:31:58 +0000
commit8c4b599b7c62b85069fa04533e8f06e5476f927a (patch)
treeb65da84b4a6f7f2104a211d8b2f905b92f5389e6 /actionpack/lib
parentc963f8e955ca5a2d1cc668ee5fa1f7e5f1fba689 (diff)
downloadrails-8c4b599b7c62b85069fa04533e8f06e5476f927a.tar.gz
rails-8c4b599b7c62b85069fa04533e8f06e5476f927a.tar.bz2
rails-8c4b599b7c62b85069fa04533e8f06e5476f927a.zip
Fix assert_redirected_to issue with named routes for module controllers. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4757 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/assertions.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index e81ebfb893..443449345b 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -108,13 +108,14 @@ module Test #:nodoc:
end
if value.respond_to?(:[]) && value['controller']
- if key == :actual && value['controller'].first != '/'
+ if key == :actual && value['controller'].first != '/' && !value['controller'].include?('/')
value['controller'] = ActionController::Routing.controller_relative_to(value['controller'], @controller.class.controller_path)
end
value['controller'] = value['controller'][1..-1] if value['controller'].first == '/' # strip leading hash
end
url[key] = value
end
+
@response_diff = url[:expected].diff(url[:actual]) if url[:actual]
msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>), difference: <?>",