diff options
-rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb | 5 | ||||
-rw-r--r-- | actionpack/test/template/url_helper_test.rb | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index f45727f508..a2831aff67 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -78,9 +78,8 @@ module ActionController 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: <?>", - url[:actual], @response_diff) + @response_diff = url[:actual].diff(url[:expected]) if url[:actual] + msg = build_message(message, "expected a redirect to <?>, found one to <?>, a difference of <?> ", url[:expected], url[:actual], @response_diff) assert_block(msg) do url[:expected].keys.all? do |k| diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index db1e226a7e..712b827c5c 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -108,6 +108,16 @@ class UrlHelperTest < Test::Unit::TestCase def test_link_tag_with_query_and_no_name assert_dom_equal "<a href=\"http://www.example.com?q1=v1&q2=v2\">http://www.example.com?q1=v1&q2=v2</a>", link_to(nil, "http://www.example.com?q1=v1&q2=v2") end + + def test_link_tag_with_back + @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'}) + assert_dom_equal "<a href=\"http://www.example.com/referer\">go back</a>", link_to('go back', :back) + end + + def test_link_tag_with_back_and_no_referer + @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {}) + assert_dom_equal "<a href=\"javascript:history.back()\">go back</a>", link_to('go back', :back) + end def test_link_tag_with_img assert_dom_equal "<a href=\"http://www.example.com\"><img src='/favicon.jpg' /></a>", link_to("<img src='/favicon.jpg' />", "http://www.example.com") |