diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
commit | c01c8967a02537f132d437d5ae15332982119651 (patch) | |
tree | 76ed47f6bffd5fe1aa11c65cd32b222d881f43aa /activeresource/test/base/load_test.rb | |
parent | 770fca10fba68fa14308f33e923493e6f63bfa35 (diff) | |
parent | ccf28d2499d1b4e2aba41291eb800e0e02120923 (diff) | |
download | rails-c01c8967a02537f132d437d5ae15332982119651.tar.gz rails-c01c8967a02537f132d437d5ae15332982119651.tar.bz2 rails-c01c8967a02537f132d437d5ae15332982119651.zip |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/calculations.rb
Diffstat (limited to 'activeresource/test/base/load_test.rb')
-rw-r--r-- | activeresource/test/base/load_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activeresource/test/base/load_test.rb b/activeresource/test/base/load_test.rb index 5f5a580445..1952f5b5f0 100644 --- a/activeresource/test/base/load_test.rb +++ b/activeresource/test/base/load_test.rb @@ -52,8 +52,8 @@ class BaseLoadTest < Test::Unit::TestCase :notable_rivers => [ { :id => 1, :name => 'Willamette' }, { :id => 2, :name => 'Columbia', :rafted_by => @matz }], - :postal_codes => [97018,1234567890], - :places => ["Columbia City", "Unknown"]}}} + :postal_codes => [ 97018, 1234567890 ], + :places => [ "Columbia City", "Unknown" ]}}} @person = Person.new end @@ -135,7 +135,7 @@ class BaseLoadTest < Test::Unit::TestCase assert_equal 2, postal_codes.size assert_kind_of Fixnum, postal_codes.first assert_equal @deep[:street][:state][:postal_codes].first, postal_codes.first - assert_kind_of Bignum, postal_codes.last + assert_kind_of Numeric, postal_codes.last assert_equal @deep[:street][:state][:postal_codes].last, postal_codes.last places = state.places |