diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-09 07:05:41 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-09 07:05:41 -0800 |
| commit | e56b8900f9b7704db8a01f5c54ee48f5935f406f (patch) | |
| tree | b7578af7e8b648f1ebfb2f1e3ec8ece7b5a2ae78 /actionpack/lib | |
| parent | 9622b3fd2cce642ca35f121395848887b9ff070f (diff) | |
| parent | 88d59de12d9951c0ac18a1e53e52f92c00c15849 (diff) | |
| download | rails-e56b8900f9b7704db8a01f5c54ee48f5935f406f.tar.gz rails-e56b8900f9b7704db8a01f5c54ee48f5935f406f.tar.bz2 rails-e56b8900f9b7704db8a01f5c54ee48f5935f406f.zip | |
Merge pull request #8158 from steveklabnik/deprecate_diff
Deprecate Hash#diff.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 305bafc0c5..8f17ee05be 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -1,5 +1,4 @@ require 'uri' -require 'active_support/core_ext/hash/diff' require 'active_support/core_ext/hash/indifferent_access' require 'action_controller/metal/exceptions' @@ -44,9 +43,8 @@ module ActionDispatch expected_options.stringify_keys! - # FIXME: minitest does object diffs, do we need to have our own? message ||= sprintf("The recognized options <%s> did not match <%s>, difference: <%s>", - request.path_parameters, expected_options, expected_options.diff(request.path_parameters)) + request.path_parameters, expected_options, diff(expected_options, request.path_parameters)) assert_equal(expected_options, request.path_parameters, message) end |