diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-01 14:33:59 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-01 14:33:59 -0800 |
| commit | c266a6bf0f219f211979b67396750fc9071b0391 (patch) | |
| tree | 88731ddeb1cebc9cf3055ad18ecd6f4bb3af5085 | |
| parent | a49de9811ab4cf39fbdb5a6941ee003b1e489184 (diff) | |
| download | rails-c266a6bf0f219f211979b67396750fc9071b0391.tar.gz rails-c266a6bf0f219f211979b67396750fc9071b0391.tar.bz2 rails-c266a6bf0f219f211979b67396750fc9071b0391.zip | |
fixing tests and warnings
| -rw-r--r-- | activerecord/test/cases/ar_schema_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/schema_dumper_test.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb index 28f219e213..e007c12c33 100644 --- a/activerecord/test/cases/ar_schema_test.rb +++ b/activerecord/test/cases/ar_schema_test.rb @@ -55,11 +55,11 @@ if ActiveRecord::Base.connection.supports_migrations? assert_equal "123001", rows[0]["version"] assert_equal "", rows[0]["name"] - assert_match /^2\d\d\d-/, rows[0]["migrated_at"] + assert_match(/^2\d\d\d-/, rows[0]["migrated_at"]) assert_equal "123002", rows[1]["version"] assert_equal "add_magic_power_to_unicorns", rows[1]["name"] - assert_match /^2\d\d\d-/, rows[1]["migrated_at"] + assert_match(/^2\d\d\d-/, rows[1]["migrated_at"]) end def test_define_clears_schema_migrations diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb index fdcf1b5cd4..7914ee0a6f 100644 --- a/activerecord/test/cases/schema_dumper_test.rb +++ b/activerecord/test/cases/schema_dumper_test.rb @@ -18,6 +18,10 @@ class SchemaDumperTest < ActiveRecord::TestCase end def test_schema_dump_includes_migrations + $".delete_if do |fname| + fname == (MIGRATIONS_ROOT + "/valid/1_people_have_last_names.rb") + end + conn = ActiveRecord::Base.connection sm_table = ActiveRecord::Migrator.schema_migrations_table_name conn.execute "DELETE FROM #{conn.quote_table_name(sm_table)}" |