aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/mysql
diff options
context:
space:
mode:
authorKuldeep Aggarwal <kd.engineer@yahoo.co.in>2013-12-29 13:57:52 +0530
committerKuldeep Aggarwal <kd.engineer@yahoo.co.in>2013-12-29 13:57:52 +0530
commit143da09f5177d66ccad6a3141f90fc275f01c754 (patch)
tree8b5b9f9359efefbb31dfc2c286bdcd739b293a6b /activerecord/test/cases/adapters/mysql
parentf66f483d900dfbcb6dfa2df9c6188663489475ab (diff)
downloadrails-143da09f5177d66ccad6a3141f90fc275f01c754.tar.gz
rails-143da09f5177d66ccad6a3141f90fc275f01c754.tar.bz2
rails-143da09f5177d66ccad6a3141f90fc275f01c754.zip
used user-defined configurations for running tests that might depend on user's system configuration
Diffstat (limited to 'activerecord/test/cases/adapters/mysql')
-rw-r--r--activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index a85f3d4298..605a2d86e4 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -18,7 +18,8 @@ module ActiveRecord
def test_bad_connection_mysql
assert_raise ActiveRecord::NoDatabaseError do
- connection = ActiveRecord::Base.mysql_connection(adapter: "mysql", database: "should_not_exist-cinco-dog-db")
+ configuration = ActiveRecord::Base.configurations['arunit'].merge(database: 'should_not_exist-cinco-dog-db')
+ connection = ActiveRecord::Base.mysql_connection(configuration)
connection.exec_query('drop table if exists ex')
end
end