github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-08 13:15:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks to make sure assert_redirected_to works with symbols

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4649 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck
2006-08-01 21:34:58 +00:00
parent 0cfde5f8c0
commit 49f44daf17
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
actionpack/lib/action_controller/assertions.rb
View File

@@ -81,8 +81,9 @@ module Test #:nodoc:
original = { :expected => options, :actual => @response.redirected_to.is_a?(Symbol) ? @response.redirected_to : @response.redirected_to.dup }
original.each do |key, value|
if value.is_a?(Symbol)
value = @controller.respond_to?(value, true) ? @controller.send(value) : @controller.send("hash_for_#{option}")
value = @controller.respond_to?(value, true) ? @controller.send(value) : @controller.send("hash_for_#{value}_url")
end
unless value.is_a?(Hash)
request = case value
when NilClass then nil
@@ -91,8 +92,13 @@ module Test #:nodoc:
end
value = request.path_parameters if request
end
if value.is_a?(Hash) # stringify 2 levels of hash keys
if name = value.delete(:use_route)
route = ActionController::Routing::Routes.named_routes[name]
value.update(route.parameter_shell)
end
value.stringify_keys!
value.values.select { |v| v.is_a?(Hash) }.collect { |v| v.stringify_keys! }
if key == :expected && value['controller'] == @controller.controller_name && original[:actual].is_a?(Hash)