From d2d72966c30e8a537ad1c5dbab52b148645d7b37 Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Tue, 10 Jul 2018 23:31:37 +0300 Subject: [PATCH] Fix stubbed methods in test cases Remove returning of `false` value for stubbed `lock_thread=` methods since there aren't any needs in it. Remove unnecessary returning of `true` for stubbed `drop_database` method. Follow up #33309. Related to #33162, #33326. --- activerecord/test/cases/fixtures_test.rb | 4 ++-- activerecord/test/cases/tasks/mysql_rake_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb index 2d8cbed24e..2ead2c4816 100644 --- a/activerecord/test/cases/fixtures_test.rb +++ b/activerecord/test/cases/fixtures_test.rb @@ -842,7 +842,7 @@ class TransactionalFixturesOnConnectionNotification < ActiveRecord::TestCase end.new connection.pool = Class.new do - def lock_thread=(lock_thread); false; end + def lock_thread=(lock_thread); end end.new connection.expects(:begin_transaction).with(joinable: false) @@ -863,7 +863,7 @@ class TransactionalFixturesOnConnectionNotification < ActiveRecord::TestCase end.new connection.pool = Class.new do - def lock_thread=(lock_thread); false; end + def lock_thread=(lock_thread); end end.new fire_connection_notification(connection) diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb index ff2d66b17e..155b060b1e 100644 --- a/activerecord/test/cases/tasks/mysql_rake_test.rb +++ b/activerecord/test/cases/tasks/mysql_rake_test.rb @@ -104,7 +104,7 @@ if current_adapter?(:Mysql2Adapter) class MySQLDBDropTest < ActiveRecord::TestCase def setup - @connection = Class.new { def drop_database(name); true end }.new + @connection = Class.new { def drop_database(name); end }.new @configuration = { "adapter" => "mysql2", "database" => "my-app-db"