Fix the skip code.

Checking for the constant doesn't work

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"