aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Paschich <dpassage@flophouse.com>2012-06-02 19:16:49 -0700
committerDavid Paschich <dpassage@flophouse.com>2012-06-03 17:24:17 -0700
commita36bda87703ca12e88961cfaa5aed4014c69a9d3 (patch)
treeb9bd10be29384d0535ac0195afe4295027d2a682 /activerecord
parentd10eb699649f9d7fa7e51ae1b633545d6a55e1ad (diff)
downloadrails-a36bda87703ca12e88961cfaa5aed4014c69a9d3.tar.gz
rails-a36bda87703ca12e88961cfaa5aed4014c69a9d3.tar.bz2
rails-a36bda87703ca12e88961cfaa5aed4014c69a9d3.zip
The resolver tests fail if the mysql gem is not installed; this breaks
being able to run the sqlite3 tests without that gem. This fix ensures the tests will only run if the mysql gem is installed. A better solution might be to move these tests into the per-adapter tests, and test each adapter's resolver.
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 e6cb1b9521..673a2b2b88 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",