Improve mailer argument deserialisation for 6.1 on Ruby 3.1 #2566
Conversation
This file contains hidden or 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
JonRowe
commented
Jan 25, 2022
| def ruby_3_1? | ||
| RUBY_VERSION >= "3.1" | ||
| end | ||
|
|
There was a problem hiding this comment.
If we want this it should be in RSpec Support, its a later improvement that could be made once 3.11 is released.
JonRowe
commented
Jan 25, 2022
| }.to have_enqueued_mail(UnifiedMailer, :email_with_args).with({'foo' => 'bar'}, 1, 2) | ||
| }.to have_enqueued_mail(UnifiedMailer, :email_with_args).with( | ||
| a_hash_including(params: {'foo' => 'bar'}, args: [1, 2]) | ||
| ) |
There was a problem hiding this comment.
This just unpicks the changes to the behaviour
There was a problem hiding this comment.
I wonder if both:
have_enqueued_mail(UnifiedMailer, :email_with_args).with(
a_hash_including(params: {'foo' => 'bar'}, args: [1, 2])
)and
have_enqueued_mail(UnifiedMailer, :email_with_args).with({'foo' => 'bar'}, 1, 2)would match.
I was believing that the change from #2516 made both match, but it's not confirmed in specs.
JonRowe
force-pushed
the
ruby-31-mailer-fixes
branch
6 times, most recently
from
84f4b30 to
b427c6e
Compare
JonRowe
force-pushed
the
ruby-31-mailer-fixes
branch
from
b427c6e to
d9dc770
Compare
JonRowe
added a commit
that referenced
this pull request
Jan 25, 2022
Improve mailer argument deserialisation for 6.1 on Ruby 3.1
|
I really like how you've structured the code here. |
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.
@pirj this is a simpler version of the changes required to fix mailers solely on Ruby 3.1 for Rails 6.1
The problem was not the different mailers but simply that Rails changed (only on 6.1) how it deserialized arguments, this logic restores that original implementation for our matcher and is the change I want to ship in the next 5.0 and 5.1 releases.
Arguably this could be in the jobs matcher and I'm surprised our specs pass as is for the jobs matcher, but its probably because that has less explicit requirements around deserialising.
I'm going to merge this to 5-1-maintenance and cherry pick to 5-0-maintenance on green, so you don't have to worry about that.