aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-03-03 10:53:37 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-03-03 10:53:37 -0800
commit833181f5983bf77cfe359af6fcb9ede5fb8151f8 (patch)
treebd8255ebc5ef11c195532d660de74975e18426f8 /activerecord
parent2aec357b7e8e310be107b479224524f12f83d5a5 (diff)
parentd8996d3cab5657358656b572f3096a0a14bf0ccb (diff)
downloadrails-833181f5983bf77cfe359af6fcb9ede5fb8151f8.tar.gz
rails-833181f5983bf77cfe359af6fcb9ede5fb8151f8.tar.bz2
rails-833181f5983bf77cfe359af6fcb9ede5fb8151f8.zip
Merge pull request #5260 from castlerock/remove_ordered_hash_usages
remove usage of AS::OrderedHash from other places
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/nested_attributes_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 728ac22fda..09276a034e 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -673,7 +673,7 @@ module NestedAttributesOnACollectionAssociationTests
def test_should_raise_an_argument_error_if_something_else_than_a_hash_is_passed
assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, {}) }
- assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, ActiveSupport::OrderedHash.new) }
+ assert_nothing_raised(ArgumentError) { @pirate.send(association_setter, Hash.new) }
assert_raise_with_message ArgumentError, 'Hash or Array expected, got String ("foo")' do
@pirate.send(association_setter, "foo")