diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-12-19 16:51:40 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 16:51:40 +1030 |
| commit | 96c58fc438b9b9bed57e218d9fd488e4516ddff5 (patch) | |
| tree | 15905733d22efb8b246c292668681dfea78abc60 | |
| parent | b2672c739b9fe3a5b37249d899bdec9c3b9726cf (diff) | |
| parent | 37221c6e0cf9336eed867e80765efa43b3ba10db (diff) | |
| download | rails-96c58fc438b9b9bed57e218d9fd488e4516ddff5.tar.gz rails-96c58fc438b9b9bed57e218d9fd488e4516ddff5.tar.bz2 rails-96c58fc438b9b9bed57e218d9fd488e4516ddff5.zip | |
Merge pull request #27401 from kamipo/consolidate_duplicated_elsif_branch
Consolidate duplicated elsif branch
| -rw-r--r-- | activerecord/test/cases/schema_dumper_test.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb index 97096e31e7..bea78d2a95 100644 --- a/activerecord/test/cases/schema_dumper_test.rb +++ b/activerecord/test/cases/schema_dumper_test.rb @@ -148,12 +148,7 @@ class SchemaDumperTest < ActiveRecord::TestCase assert_match %r{c_int_4.*limit: 4}, output end - if current_adapter?(:SQLite3Adapter) - assert_match %r{c_int_5.*limit: 5}, output - assert_match %r{c_int_6.*limit: 6}, output - assert_match %r{c_int_7.*limit: 7}, output - assert_match %r{c_int_8.*limit: 8}, output - elsif current_adapter?(:OracleAdapter) + if current_adapter?(:SQLite3Adapter, :OracleAdapter) assert_match %r{c_int_5.*limit: 5}, output assert_match %r{c_int_6.*limit: 6}, output assert_match %r{c_int_7.*limit: 7}, output |