diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2012-11-09 15:24:05 +0100 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2012-11-09 15:57:18 +0100 |
| commit | 88d59de12d9951c0ac18a1e53e52f92c00c15849 (patch) | |
| tree | 071cb9c1beffdd548fb094188c1e128a35022041 /actionpack | |
| parent | 6710f057f9033aec2ef62b961b9a2000a2d499e5 (diff) | |
| download | rails-88d59de12d9951c0ac18a1e53e52f92c00c15849.tar.gz rails-88d59de12d9951c0ac18a1e53e52f92c00c15849.tar.bz2 rails-88d59de12d9951c0ac18a1e53e52f92c00c15849.zip | |
Deprecate Hash#diff.
It's no longer used in Rails any more.
See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more
Diffstat (limited to 'actionpack')
| -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 |