aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/connection_specification
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-28 23:47:20 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-28 23:48:34 -0200
commit81679ab2ae8c9f6a233374efe9fcf096cf9f8fd9 (patch)
treec8c08d3fe4a59c60350120837d972010d670635f /activerecord/test/cases/connection_specification
parent1743e9594117743a5a5dc30106cd071da672e9a6 (diff)
downloadrails-81679ab2ae8c9f6a233374efe9fcf096cf9f8fd9.tar.gz
rails-81679ab2ae8c9f6a233374efe9fcf096cf9f8fd9.tar.bz2
rails-81679ab2ae8c9f6a233374efe9fcf096cf9f8fd9.zip
Fix the skip code.
Checking for the constant doesn't work
Diffstat (limited to 'activerecord/test/cases/connection_specification')
-rw-r--r--activerecord/test/cases/connection_specification/resolver_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/connection_specification/resolver_test.rb b/activerecord/test/cases/connection_specification/resolver_test.rb
index 40c4dc94d1..ee9818678d 100644
--- a/activerecord/test/cases/connection_specification/resolver_test.rb
+++ b/activerecord/test/cases/connection_specification/resolver_test.rb
@@ -9,7 +9,7 @@ module ActiveRecord
end
def test_url_host_no_db
- skip "only if mysql is available" unless defined?(MysqlAdapter)
+ skip "only if mysql is available" unless current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
spec = resolve 'mysql://foo?encoding=utf8'
assert_equal({
:adapter => "mysql",
@@ -18,7 +18,7 @@ module ActiveRecord
end
def test_url_host_db
- skip "only if mysql is available" unless defined?(MysqlAdapter)
+ skip "only if mysql is available" unless current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
spec = resolve 'mysql://foo/bar?encoding=utf8'
assert_equal({
:adapter => "mysql",
@@ -28,7 +28,7 @@ module ActiveRecord
end
def test_url_port
- skip "only if mysql is available" unless defined?(MysqlAdapter)
+ skip "only if mysql is available" unless current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
spec = resolve 'mysql://foo:123?encoding=utf8'
assert_equal({
:adapter => "mysql",
@@ -38,7 +38,7 @@ module ActiveRecord
end
def test_encoded_password
- skip "only if mysql is available" unless defined?(MysqlAdapter)
+ skip "only if mysql is available" unless current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
password = 'am@z1ng_p@ssw0rd#!'
encoded_password = URI.encode_www_form_component(password)
spec = resolve "mysql://foo:#{encoded_password}@localhost/bar"