diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2013-12-29 12:32:06 -0800 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2013-12-29 12:32:06 -0800 |
commit | 10721450dec7b9730cb7ea99d8f8b5978a33d561 (patch) | |
tree | 4d845f588036e5d5807f1eda93533eaf63c92d22 /activerecord/test/cases/adapters/mysql2 | |
parent | 524ad8f572264627158a776eb55df2be74e593e4 (diff) | |
parent | 143da09f5177d66ccad6a3141f90fc275f01c754 (diff) | |
download | rails-10721450dec7b9730cb7ea99d8f8b5978a33d561.tar.gz rails-10721450dec7b9730cb7ea99d8f8b5978a33d561.tar.bz2 rails-10721450dec7b9730cb7ea99d8f8b5978a33d561.zip |
Merge pull request #13527 from kuldeepaggarwal/f-independent-specs
Use user-defined configurations in mysql tests
Diffstat (limited to 'activerecord/test/cases/adapters/mysql2')
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/connection_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb index 91b780a7ee..8fe8bd7df3 100644 --- a/activerecord/test/cases/adapters/mysql2/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb @@ -15,7 +15,8 @@ class MysqlConnectionTest < ActiveRecord::TestCase def test_bad_connection assert_raise ActiveRecord::NoDatabaseError do - connection = ActiveRecord::Base.mysql2_connection(adapter: "mysql2", database: "should_not_exist-cinco-dog-db") + configuration = ActiveRecord::Base.configurations['arunit'].merge(database: 'should_not_exist-cinco-dog-db') + connection = ActiveRecord::Base.mysql2_connection(configuration) connection.exec_query('drop table if exists ex') end end |