mailing#60: Fix regression where multiple bulk recipient option isn't respected #16223
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
|
(Standard links)
|
|
test fails look related here @MegaphoneJon |
|
Jenkins re test this please |
seamuslee001
reviewed
Jan 8, 2020
| 'email' => 'mail1@example.org', | ||
| 'is_bulkmail' => 1, | ||
| ]); | ||
| $this->callAPISuccess('email', 'create', [ |
There was a problem hiding this comment.
Suggested change
| $this->callAPISuccess('email', 'create', [ | |
| $email2 = $this->callAPISuccess('email', 'create', [ |
seamuslee001
reviewed
Jan 8, 2020
| 'civimail_multiple_bulk_emails' => 1, | ||
| ]); | ||
| $contactID = $this->individualCreate(['first_name' => 'test recipient']); | ||
| $this->callAPISuccess('email', 'create', [ |
There was a problem hiding this comment.
Suggested change
| $this->callAPISuccess('email', 'create', [ | |
| $email1 = $this->callAPISuccess('email', 'create', [ |
seamuslee001
reviewed
Jan 8, 2020
| $this->assertEquals(2, $this->callAPISuccess('MailingRecipients', 'get', ['mailing_id' => $mailing['id']])['count']); | ||
| $this->callAPISuccess('job', 'process_mailing', []); | ||
| $this->_mut->assertRecipients([['mail1@example.org'], ['mail2@example.org']]); | ||
|
|
There was a problem hiding this comment.
Suggested change
| $this->callAPISuccess('Email', 'delete', ['id' => $email1['id']]); |
seamuslee001
reviewed
Jan 8, 2020
| $this->callAPISuccess('job', 'process_mailing', []); | ||
| $this->_mut->assertRecipients([['mail1@example.org'], ['mail2@example.org']]); | ||
|
|
||
| } |
There was a problem hiding this comment.
Suggested change
| } | |
| $this->callAPISuccess('Email', 'delete', ['id' => $email2['id']]); | |
| } |
|
@MegaphoneJon this looks good to me the test failures are coming from your new test (data lying around) have added suggestions to make it happen and can you rebase this against 5.22 please as it is a regression it is better to get fixed into the RC |
|
Closing in favor of #16239 (rebase on 5.22) |
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.
Overview
A regression in Civi 5.19+ causes "Enable bulk email recipients" setting in CiviMail to not be respected. In fact, the "bulk email' value isn't respected at all.
Before
Only a primary email address can receive a CiviMail email.
After
Original behavior restored.
Technical Details
The PR introducing the regression filters out emails from a mailing where e.g. a contact was marked as deceased after the mailing was queued but before it was sent. It also filters out folks who were marked "do not mail" or "on hold" between scheduling and sending. However, it erroneously includes a requirement that the email address be primary.