This repository has been archived by the owner on Feb 8, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 308
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Start standardizing on dash in email template name
- Loading branch information
1 parent
5a4b097
commit 00e6054
Showing
3 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
File renamed without changes.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -310,26 +310,26 @@ def test_html_escaping(self): | |
def test_queueing_email_is_throttled(self): | ||
self.app.email_queue.put(self.alice, "verification") | ||
self.app.email_queue.put(self.alice, "branch") | ||
self.app.email_queue.put(self.alice, "verification_notice") | ||
self.app.email_queue.put(self.alice, "verification-notice") | ||
raises(Throttled, self.app.email_queue.put, self.alice, "branch") | ||
|
||
def test_only_user_initiated_messages_count_towards_throttling(self): | ||
self.app.email_queue.put(self.alice, "verification") | ||
self.app.email_queue.put(self.alice, "verification", _user_initiated=False) | ||
self.app.email_queue.put(self.alice, "branch") | ||
self.app.email_queue.put(self.alice, "branch", _user_initiated=False) | ||
self.app.email_queue.put(self.alice, "verification_notice") | ||
self.app.email_queue.put(self.alice, "verification_notice", _user_initiated=False) | ||
self.app.email_queue.put(self.alice, "verification-notice") | ||
self.app.email_queue.put(self.alice, "verification-notice", _user_initiated=False) | ||
raises(Throttled, self.app.email_queue.put, self.alice, "branch") | ||
|
||
def test_flushing_queue_resets_throttling(self): | ||
self.add(self.alice, '[email protected]') | ||
assert self.app.email_queue.flush() == 1 | ||
self.app.email_queue.put(self.alice, "verification") | ||
self.app.email_queue.put(self.alice, "branch") | ||
self.app.email_queue.put(self.alice, "verification_notice") | ||
self.app.email_queue.put(self.alice, "verification-notice") | ||
assert self.app.email_queue.flush() == 3 | ||
self.app.email_queue.put(self.alice, "verification_notice") | ||
self.app.email_queue.put(self.alice, "verification-notice") | ||
|
||
|
||
class FlushEmailQueue(SentEmailHarness): | ||
|