diff options
Diffstat (limited to 'actionpack/lib/action_controller/assertions.rb')
| -rw-r--r-- | actionpack/lib/action_controller/assertions.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index bb81ffac75..ad70111f3b 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -78,9 +78,8 @@ module Test #:nodoc: [u, (p[0..0] == '/') ? p : '/' + p] end.flatten - if eurl && url then assert_equal(eurl, url, msg) - else assert_equal(epath, path, msg) - end + 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) |