From 08e781569aea7f0e084c169c70b452e337aa1b5f Mon Sep 17 00:00:00 2001 From: Kir Shatrov Date: Sat, 25 Feb 2017 16:33:06 -0600 Subject: Deprecate AbstractAdapter#verify! with arguments --- activerecord/test/cases/adapters/mysql2/connection_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'activerecord/test/cases/adapters') diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb index bae283a048..20f1b77f31 100644 --- a/activerecord/test/cases/adapters/mysql2/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb @@ -63,6 +63,18 @@ class Mysql2ConnectionTest < ActiveRecord::Mysql2TestCase assert @connection.active? end + def test_verify_with_args_is_deprecated + assert_deprecated do + @connection.verify!(option: true) + end + assert_deprecated do + @connection.verify!([]) + end + assert_deprecated do + @connection.verify!({}) + end + end + def test_execute_after_disconnect @connection.disconnect! -- cgit v1.2.3 From cb3270cf4e13cfb6ba554e0fa52402657c51d171 Mon Sep 17 00:00:00 2001 From: Kir Shatrov Date: Sat, 25 Feb 2017 19:44:42 -0600 Subject: Use ensure block for things we cleanup in tests --- activerecord/test/cases/adapters/mysql2/connection_test.rb | 2 +- activerecord/test/cases/adapters/postgresql/connection_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord/test/cases/adapters') diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb index bae283a048..58bf3003b8 100644 --- a/activerecord/test/cases/adapters/mysql2/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb @@ -42,7 +42,7 @@ class Mysql2ConnectionTest < ActiveRecord::Mysql2TestCase @connection.update("set @@wait_timeout=1") sleep 2 assert !@connection.active? - + ensure # Repair all fixture connections so other tests won't break. @fixture_connections.each(&:verify!) end diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb index 3cbd4ca212..98d392f25a 100644 --- a/activerecord/test/cases/adapters/postgresql/connection_test.rb +++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb @@ -178,6 +178,7 @@ module ActiveRecord "umm -- looks like you didn't break the connection, because we're still " \ "successfully querying with the same connection pid." + ensure # Repair all fixture connections so other tests won't break. @fixture_connections.each(&:verify!) end -- cgit v1.2.3