diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-07-10 18:03:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 18:03:35 -0400 |
| commit | 7fc499d1353f98b96c09ee755045e4aa37880962 (patch) | |
| tree | 6c7e0e4aec57cd730d33c89e7cb65174ee514d55 | |
| parent | 23f80cee1845f85ed3aad4b4fb3211cdadf53da8 (diff) | |
| parent | d2d72966c30e8a537ad1c5dbab52b148645d7b37 (diff) | |
| download | rails-7fc499d1353f98b96c09ee755045e4aa37880962.tar.gz rails-7fc499d1353f98b96c09ee755045e4aa37880962.tar.bz2 rails-7fc499d1353f98b96c09ee755045e4aa37880962.zip | |
Merge pull request #33336 from bogdanvlviv/fix-stubbed-methods-in-test-cases
Fix stubbed methods in test cases
| -rw-r--r-- | activerecord/test/cases/fixtures_test.rb | 4 | ||||
| -rw-r--r-- | 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" |