Replace shallow mocks with Ruby classes #33326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @kamipo (@rails-bot has picked a reviewer for you, use r? to override) |
utilum
force-pushed
the
replace_shallow_mocks_with_ruby
branch
from
6054a2b
to
194eb22
Compare
While preparing this I realised that some stubbed returns values serve no purpose, so this patch drops those as well. Step 3 in rails#33162
utilum
force-pushed
the
replace_shallow_mocks_with_ruby
branch
from
194eb22
to
f7bfb3d
Compare
bogdanvlviv
reviewed
Jul 10, 2018
| end.new | ||
|
|
||
| connection.pool = Class.new do | ||
| def lock_thread=(lock_thread); false; end |
There was a problem hiding this comment.
Returning false seems extra to me. There is one more occurrence below. See diff:
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 @@ def rollback_transaction(*args); end
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 @@ def rollback_transaction(*args)
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)
bogdanvlviv
reviewed
Jul 10, 2018
| ActiveRecord::Tasks::DatabaseTasks.create @configuration | ||
| end | ||
| end | ||
| end | ||
|
|
||
| class MySQLDBDropTest < ActiveRecord::TestCase | ||
| def setup | ||
| @connection = stub(drop_database: true) | ||
| @connection = Class.new { def drop_database(name); true end }.new |
There was a problem hiding this comment.
Looks like returing true doesn't make any effect on test cases, so i think we can omit returing true too.
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 @@ def test_raises_error
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"
bogdanvlviv
added a commit
to bogdanvlviv/rails
that referenced
this pull request
Jul 10, 2018
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 rails#33309. Related to rails#33162, rails#33326.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While preparing this I realised that some stubbed returns values
serve no purpose, so this patch drops those as well.
Step 3 in #33162