diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-01 19:17:37 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-01 19:18:34 -0300 |
| commit | bb38df89bfbfc37913babe2edf6ad73b0dc80358 (patch) | |
| tree | 1b4bf7f0dc3e6824e812c6fd06b79ce9f0c409be /activerecord/test/cases/schema_dumper_test.rb | |
| parent | baf8e34697b38f2ebbf1f868ac950da767d319a5 (diff) | |
| download | rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.tar.gz rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.tar.bz2 rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.zip | |
Standardize the use of current_adapter?
Diffstat (limited to 'activerecord/test/cases/schema_dumper_test.rb')
| -rw-r--r-- | activerecord/test/cases/schema_dumper_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb index 7ff0044bd4..907b7bec30 100644 --- a/activerecord/test/cases/schema_dumper_test.rb +++ b/activerecord/test/cases/schema_dumper_test.rb @@ -112,7 +112,7 @@ class SchemaDumperTest < ActiveRecord::TestCase assert_match %r{c_int_4.*}, output assert_no_match %r{c_int_4.*limit:}, output - elsif current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter) + elsif current_adapter?(:MysqlAdapter, :Mysql2Adapter) assert_match %r{c_int_1.*limit: 1}, output assert_match %r{c_int_2.*limit: 2}, output assert_match %r{c_int_3.*limit: 3}, output @@ -197,7 +197,7 @@ class SchemaDumperTest < ActiveRecord::TestCase assert_match %r(primary_key: "movieid"), match[1], "non-standard primary key not preserved" end - if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter) + if current_adapter?(:MysqlAdapter, :Mysql2Adapter) def test_schema_dump_should_not_add_default_value_for_mysql_text_field output = standard_dump assert_match %r{t.text\s+"body",\s+null: false$}, output |