diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-09 05:06:40 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-09 05:06:40 -0800 |
| commit | 31aa822b4c5ccf9df3bb2be1886384e9a5072499 (patch) | |
| tree | cc1503a6595646ee92a91b54d4b7432db42cb5ad /activerecord/test | |
| parent | 39a3058beb3e227596212b342b6dfea267a4fcf1 (diff) | |
| parent | fcbe18d9b5c72b387cfca679aa7005dfcbe4a0ed (diff) | |
| download | rails-31aa822b4c5ccf9df3bb2be1886384e9a5072499.tar.gz rails-31aa822b4c5ccf9df3bb2be1886384e9a5072499.tar.bz2 rails-31aa822b4c5ccf9df3bb2be1886384e9a5072499.zip | |
Merge pull request #4966 from Karunakar/moving_ordered_hash_to_hash
moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ord...
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/migration_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 575df2f84b..92dc150104 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -800,7 +800,7 @@ class CopyMigrationsTest < ActiveRecord::TestCase @migrations_path = MIGRATIONS_ROOT + "/valid" @existing_migrations = Dir[@migrations_path + "/*.rb"] - sources = ActiveSupport::OrderedHash.new + sources = {} sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy" sources[:omg] = MIGRATIONS_ROOT + "/to_copy2" ActiveRecord::Migration.copy(@migrations_path, sources) @@ -841,7 +841,7 @@ class CopyMigrationsTest < ActiveRecord::TestCase @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps" @existing_migrations = Dir[@migrations_path + "/*.rb"] - sources = ActiveSupport::OrderedHash.new + sources = {} sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy_with_timestamps" sources[:omg] = MIGRATIONS_ROOT + "/to_copy_with_timestamps2" @@ -882,8 +882,8 @@ class CopyMigrationsTest < ActiveRecord::TestCase def test_skipping_migrations @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps" @existing_migrations = Dir[@migrations_path + "/*.rb"] - - sources = ActiveSupport::OrderedHash.new + + sources = {} sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy_with_timestamps" sources[:omg] = MIGRATIONS_ROOT + "/to_copy_with_name_collision" @@ -902,7 +902,7 @@ class CopyMigrationsTest < ActiveRecord::TestCase @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps" @existing_migrations = Dir[@migrations_path + "/*.rb"] - sources = ActiveSupport::OrderedHash.new + sources = {} sources[:bukkits] = MIGRATIONS_ROOT + "/to_copy_with_timestamps" skipped = [] |