From 891a962a192bdd7eb0402b41e11a5e5657fe961c Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Sun, 19 Mar 2006 03:50:14 +0000 Subject: Added nicer message for assert_redirected_to (closes #4294) [court3nay, Chris McGrath] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3969 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 12 ++++++++++++ actionpack/lib/action_controller/assertions.rb | 5 +++-- actionpack/test/controller/redirect_test.rb | 14 ++++++++++++++ activesupport/CHANGELOG | 2 ++ activesupport/lib/active_support/core_ext/hash.rb | 2 ++ activesupport/lib/active_support/core_ext/hash/diff.rb | 11 +++++++++++ activesupport/test/core_ext/hash_ext_test.rb | 6 +++++- 7 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 activesupport/lib/active_support/core_ext/hash/diff.rb diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 8803a1dd34..ec69d07b12 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,17 @@ *SVN* +* Added nicer message for assert_redirected_to (closes #4294) [court3nay] + + assert_redirected_to :action => 'other_host', :only_path => false + + when it was expecting... + + redirected_to :action => 'other_host', :only_path => true, :host => 'other.test.host' + + gives the error message... + + response is not a redirection to all of the options supplied (redirection is <{:only_path=>false, :host=>"other.test.host", :action=>"other_host"}>), difference: <{:only_path=>"true", :host=>"other.test.host"}> + * Change url_for to escape the resulting URLs when called from a view. [Nicholas Seckar, eddiewould@paradise.net.nz] * Added easy support for testing file uploads with fixture_file_upload #4105 [turnip@turnipspatch.com]. Example: diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index b3f2c235d6..2402e0941b 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -85,8 +85,9 @@ module Test #:nodoc: assert_equal(eurl, url, msg) if eurl && url assert_equal(epath, path, msg) if epath && path else - msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is )", - @response.redirected_to || @response.redirect_url) + @response_diff = options.diff(@response.redirected_to) if @response.redirected_to + msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is ), difference: ", + @response.redirected_to || @response.redirect_url, @response_diff) assert_block(msg) do if options.is_a?(Symbol) diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb index 11b32d356b..d9b9042d5a 100755 --- a/actionpack/test/controller/redirect_test.rb +++ b/actionpack/test/controller/redirect_test.rb @@ -58,6 +58,20 @@ class RedirectTest < Test::Unit::TestCase assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host' end + def test_redirect_error_with_pretty_diff + get :host_redirect + begin + assert_redirected_to :action => "other_host", :only_path => true + rescue Test::Unit::AssertionFailedError => err + redirection_msg, diff_msg = err.message.scan(/<\{[^\}]+\}>/).collect { |s| s[2..-3] } + assert_match %r(:only_path=>false), redirection_msg + assert_match %r(:host=>"other.test.host"), redirection_msg + assert_match %r(:action=>"other_host"), redirection_msg + assert_match %r(:only_path=>true), diff_msg + assert_match %r(:host=>"other.test.host"), diff_msg + end + end + def test_module_redirect get :module_redirect assert_redirect_url "http://test.host/module_test/module_redirect/hello_world" diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 4d2533e782..9217ed99d2 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added Hash#diff to show the difference between two hashes [Chris McGrath] + * Fixed HashWithIndifferentAccess#delete to work with both symbols and strings #2176 [Caio Chassot] * Added Time#advance to do precise time time calculations for cases where a month being approximated to 30 days won't do #1860 [Rick Olson] diff --git a/activesupport/lib/active_support/core_ext/hash.rb b/activesupport/lib/active_support/core_ext/hash.rb index b8309baea3..7d94d70910 100644 --- a/activesupport/lib/active_support/core_ext/hash.rb +++ b/activesupport/lib/active_support/core_ext/hash.rb @@ -2,10 +2,12 @@ require File.dirname(__FILE__) + '/hash/keys' require File.dirname(__FILE__) + '/hash/indifferent_access' require File.dirname(__FILE__) + '/hash/reverse_merge' require File.dirname(__FILE__) + '/hash/conversions' +require File.dirname(__FILE__) + '/hash/diff' class Hash #:nodoc: include ActiveSupport::CoreExtensions::Hash::Keys include ActiveSupport::CoreExtensions::Hash::IndifferentAccess include ActiveSupport::CoreExtensions::Hash::ReverseMerge include ActiveSupport::CoreExtensions::Hash::Conversions + include ActiveSupport::CoreExtensions::Hash::Diff end diff --git a/activesupport/lib/active_support/core_ext/hash/diff.rb b/activesupport/lib/active_support/core_ext/hash/diff.rb new file mode 100644 index 0000000000..deace40a29 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/hash/diff.rb @@ -0,0 +1,11 @@ +module ActiveSupport #:nodoc: + module CoreExtensions #:nodoc: + module Hash #:nodoc: + module Diff + def diff(h2) + self.dup.delete_if { |k, v| h2[k] == v }.merge(h2.dup.delete_if { |k, v| self.has_key?(k) }) + end + end + end + end +end diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index a11cef6fc4..3fc3b86254 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -174,6 +174,10 @@ class HashExtTest < Test::Unit::TestCase def test_reverse_merge assert_equal({ :a => 1, :b => 2, :c => 10 }, { :a => 1, :b => 2 }.reverse_merge({:a => "x", :b => "y", :c => 10}) ) end + + def test_diff + assert_equal({ :a => 2 }, { :a => 2, :b => 5 }.diff({ :a => 1, :b => 5 })) + end end class HashToXmlTest < Test::Unit::TestCase @@ -234,4 +238,4 @@ class HashToXmlTest < Test::Unit::TestCase xml = { :name => "David", :addresses => [{ :streets => [ { :name => "Paulina" }, { :name => "Paulina" } ] } ] }.to_xml(@xml_options) assert xml.include?(%(
)) end -end \ No newline at end of file +end -- cgit v1.2.3