aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-05-23 14:02:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-05-23 15:06:13 -0700
commit5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d (patch)
tree4ecceb39d9bb87dc61e9b40035aef1264c879616 /activerecord/test
parent1716da07204193c8acf967e2d75a53a82e4c7c28 (diff)
downloadrails-5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d.tar.gz
rails-5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d.tar.bz2
rails-5ec23b95ba7d5a00d20f6ec59f75c34a2ac73b5d.zip
fixing 1.8 support for new fixture tests
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/fixtures/file_test.rb6
-rw-r--r--activerecord/test/fixtures/categories_ordered.yml2
2 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/test/cases/fixtures/file_test.rb b/activerecord/test/cases/fixtures/file_test.rb
index 174f41f412..8dbf92ae9a 100644
--- a/activerecord/test/cases/fixtures/file_test.rb
+++ b/activerecord/test/cases/fixtures/file_test.rb
@@ -25,13 +25,15 @@ module ActiveRecord
"rails_core_account",
"last_account",
"rails_core_account_2",
- "odegy_account"], fh.to_a.map(&:first)
+ "odegy_account"].sort, fh.to_a.map(&:first).sort
end
end
def test_values
File.open(::File.join(FIXTURES_ROOT, "accounts.yml")) do |fh|
- assert_equal [1,2,3,4,5,6], fh.to_a.map(&:last).map { |x| x['id'] }
+ assert_equal [1,2,3,4,5,6].sort, fh.to_a.map(&:last).map { |x|
+ x['id']
+ }.sort
end
end
diff --git a/activerecord/test/fixtures/categories_ordered.yml b/activerecord/test/fixtures/categories_ordered.yml
index 2afc6cb5a9..294a6368d6 100644
--- a/activerecord/test/fixtures/categories_ordered.yml
+++ b/activerecord/test/fixtures/categories_ordered.yml
@@ -1,4 +1,4 @@
---- !!omap
+--- !omap
<% 100.times do |i| %>
- fixture_no_<%= i %>:
id: <%= i %>