aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-02-08 12:25:03 -0800
committerXavier Noria <fxn@hashref.com>2012-02-08 12:25:03 -0800
commit6bb04c135d00e94279c3a98f41df4a853e252909 (patch)
tree85e773f05e1502d727d46be4ace33ab8a74c4872
parent828d29c374203d50f2547060ee9e580a6dd80e8c (diff)
parent7c444916fe60ffb1afef4076e84e064899d1f1b6 (diff)
downloadrails-6bb04c135d00e94279c3a98f41df4a853e252909.tar.gz
rails-6bb04c135d00e94279c3a98f41df4a853e252909.tar.bz2
rails-6bb04c135d00e94279c3a98f41df4a853e252909.zip
Merge pull request #4949 from ask4prasath/ordered_hash_replacement_activeresource
replaced active support ordered hash to ruby hash on active resource
-rw-r--r--activeresource/test/cases/base_test.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb
index c3b963844c..f5a58793d1 100644
--- a/activeresource/test/cases/base_test.rb
+++ b/activeresource/test/cases/base_test.rb
@@ -8,7 +8,6 @@ require "fixtures/proxy"
require "fixtures/address"
require "fixtures/subscription_plan"
require 'active_support/json'
-require 'active_support/ordered_hash'
require 'active_support/core_ext/hash/conversions'
require 'mocha'
@@ -464,8 +463,7 @@ class BaseTest < ActiveSupport::TestCase
assert Person.collection_path(:gender => 'male', :student => true).include?('student=true')
assert_equal '/people.json?name%5B%5D=bob&name%5B%5D=your+uncle%2Bme&name%5B%5D=&name%5B%5D=false', Person.collection_path(:name => ['bob', 'your uncle+me', nil, false])
-
- assert_equal '/people.json?struct%5Ba%5D%5B%5D=2&struct%5Ba%5D%5B%5D=1&struct%5Bb%5D=fred', Person.collection_path(:struct => ActiveSupport::OrderedHash[:a, [2,1], 'b', 'fred'])
+ assert_equal '/people.json?struct%5Ba%5D%5B%5D=2&struct%5Ba%5D%5B%5D=1&struct%5Bb%5D=fred', Person.collection_path(:struct => {:a => [2,1], 'b' => 'fred'})
end
def test_custom_element_path