aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-05 05:35:42 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-19 21:15:55 -0300
commitb16e7ed58e39328cce94b2b4d6458553fef20ed4 (patch)
tree7fa593b1b6069b43d9600376b55685411e3309e7 /activerecord
parent22880def35c70d664f1bd82a92812c8851818d49 (diff)
downloadrails-b16e7ed58e39328cce94b2b4d6458553fef20ed4.tar.gz
rails-b16e7ed58e39328cce94b2b4d6458553fef20ed4.tar.bz2
rails-b16e7ed58e39328cce94b2b4d6458553fef20ed4.zip
Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3
Resolver tests fail if mysql adapter not installed
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/connection_specification/resolver_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/cases/connection_specification/resolver_test.rb b/activerecord/test/cases/connection_specification/resolver_test.rb
index d4b0f236ee..0e9ab8e3fc 100644
--- a/activerecord/test/cases/connection_specification/resolver_test.rb
+++ b/activerecord/test/cases/connection_specification/resolver_test.rb
@@ -9,6 +9,7 @@ module ActiveRecord
end
def test_url_host_no_db
+ skip "only if mysql is available" unless defined?(MysqlAdapter)
spec = resolve 'mysql://foo?encoding=utf8'
assert_equal({
:adapter => "mysql",
@@ -18,6 +19,7 @@ module ActiveRecord
end
def test_url_host_db
+ skip "only if mysql is available" unless defined?(MysqlAdapter)
spec = resolve 'mysql://foo/bar?encoding=utf8'
assert_equal({
:adapter => "mysql",
@@ -27,6 +29,7 @@ module ActiveRecord
end
def test_url_port
+ skip "only if mysql is available" unless defined?(MysqlAdapter)
spec = resolve 'mysql://foo:123?encoding=utf8'
assert_equal({
:adapter => "mysql",