Deduplicate setting of mailSent message #12694
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
|
(Standard links)
|
eileenmcnaughton
force-pushed
the
mem_1
branch
3 times, most recently
from
f8e1c74
to
e8ca4eb
Compare
colemanw
reviewed
Aug 28, 2018
| @@ -545,6 +546,14 @@ public function testSubmit($thousandSeparator) { | |||
| 'Receipt text', | |||
| )); | |||
| $this->mut->stop(); | |||
| $this->assertEquals([ | |||
| [ | |||
| 'text' => 'AnnualFixed membership for Mr. Anthony Anderson II has been added. The new membership End Date is December 31st, ' . date('Y') . '. A membership confirmation and receipt has been sent to anthony_anderson@civicrm.org.', | |||
There was a problem hiding this comment.
Is this one of those tests that will fail once a year on Dec 31?
There was a problem hiding this comment.
I can cope with the once a year ones - it's the once a month ones that bother me
There was a problem hiding this comment.
What's the expected behavior? That an annual membership beginning Dec 31 expires this year or next? Why not set the start date and end date in the test and avoid these quirks?
There was a problem hiding this comment.
OK - I've hard-coded the month to Feb which should keep it reliable I think - never 31 Dec
colemanw
reviewed
Aug 28, 2018
eileenmcnaughton
force-pushed
the
mem_1
branch
from
e8ca4eb
to
6d5b9c6
Compare
|
test this please |
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
Minor refactor of code around setting submit status message, adds a test
Before
Code less logically grouped
After
Code more logically grouped.
Technical Details
This is a small refactor aimed at bringing code that is logically related together. There is a loop that iterates through
and creates memberships. It is an obvious candidate for extraction but it also turns out that loop builds up the $createdMemberships array for the sole purpose of setting the message for the form user. It seems fairly clear to me that every time we see
What we should really see is some variant of
Comments
#12693 contains the a superset of this change but this is intended to be legible amount