aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2017-01-10 08:19:10 +0100
committerGitHub <noreply@github.com>2017-01-10 08:19:10 +0100
commita8a97f7788da4642466fd4d4e959433135d0dbee (patch)
tree37ea1bb680a33d695280b24291948f49877add03 /activerecord
parent6be3945d50f00e8a3286c8c794a8230a4c556a24 (diff)
parenta01a3fa608af19fff8e0491cd4e6ad18943c8010 (diff)
downloadrails-a8a97f7788da4642466fd4d4e959433135d0dbee.tar.gz
rails-a8a97f7788da4642466fd4d4e959433135d0dbee.tar.bz2
rails-a8a97f7788da4642466fd4d4e959433135d0dbee.zip
Merge pull request #27621 from dylanahsmith/mysql2-nil-connection-test
activerecord/test: Fix Mysql2ConnectionTest#test_execute_after_disconnect
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/adapters/mysql2/connection_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index c1de2218e2..bae283a048 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -66,9 +66,10 @@ class Mysql2ConnectionTest < ActiveRecord::Mysql2TestCase
def test_execute_after_disconnect
@connection.disconnect!
- assert_raise(ActiveRecord::StatementInvalid) do
+ error = assert_raise(ActiveRecord::StatementInvalid) do
@connection.execute("SELECT 1")
end
+ assert_kind_of Mysql2::Error, error.cause
end
def test_quote_after_disconnect