-
Notifications
You must be signed in to change notification settings - Fork 965
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Stop sending emails/warnings on PGP signature uploads (#15896)
- Loading branch information
Showing
8 changed files
with
13 additions
and
198 deletions.
There are no files selected for viewing
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 |
---|---|---|
|
@@ -1384,77 +1384,6 @@ def test_password_compromised_email( | |
] | ||
|
||
|
||
class TestGPGSignatureUploadedEmail: | ||
def test_gpg_signature_uploaded_email( | ||
self, pyramid_request, pyramid_config, monkeypatch | ||
): | ||
stub_user = pretend.stub( | ||
id="id", | ||
username="username", | ||
name="", | ||
email="[email protected]", | ||
primary_email=pretend.stub(email="[email protected]", verified=True), | ||
) | ||
subject_renderer = pyramid_config.testing_add_renderer( | ||
"email/gpg-signature-uploaded/subject.txt" | ||
) | ||
subject_renderer.string_response = "Email Subject" | ||
body_renderer = pyramid_config.testing_add_renderer( | ||
"email/gpg-signature-uploaded/body.txt" | ||
) | ||
body_renderer.string_response = "Email Body" | ||
html_renderer = pyramid_config.testing_add_renderer( | ||
"email/gpg-signature-uploaded/body.html" | ||
) | ||
html_renderer.string_response = "Email HTML Body" | ||
|
||
send_email = pretend.stub( | ||
delay=pretend.call_recorder(lambda *args, **kwargs: None) | ||
) | ||
pyramid_request.task = pretend.call_recorder(lambda *args, **kwargs: send_email) | ||
monkeypatch.setattr(email, "send_email", send_email) | ||
|
||
pyramid_request.db = pretend.stub( | ||
query=lambda a: pretend.stub( | ||
filter=lambda *a: pretend.stub( | ||
one=lambda: pretend.stub(user_id=stub_user.id) | ||
) | ||
), | ||
) | ||
pyramid_request.user = stub_user | ||
pyramid_request.registry.settings = {"mail.sender": "[email protected]"} | ||
project_name = "exampleproject" | ||
result = email.send_gpg_signature_uploaded_email( | ||
pyramid_request, stub_user, project_name=project_name | ||
) | ||
|
||
assert result == {"project_name": project_name} | ||
assert pyramid_request.task.calls == [pretend.call(send_email)] | ||
assert send_email.delay.calls == [ | ||
pretend.call( | ||
f"{stub_user.username} <{stub_user.email}>", | ||
{ | ||
"subject": "Email Subject", | ||
"body_text": "Email Body", | ||
"body_html": ( | ||
"<html>\n<head></head>\n" | ||
"<body><p>Email HTML Body</p></body>\n</html>\n" | ||
), | ||
}, | ||
{ | ||
"tag": "account:email:sent", | ||
"user_id": stub_user.id, | ||
"additional": { | ||
"from_": "[email protected]", | ||
"to": stub_user.email, | ||
"subject": "Email Subject", | ||
"redact_ip": False, | ||
}, | ||
}, | ||
) | ||
] | ||
|
||
|
||
class Test2FAonUploadEmail: | ||
def test_send_two_factor_not_yet_enabled_email( | ||
self, pyramid_request, pyramid_config, monkeypatch | ||
|
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
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
26 changes: 0 additions & 26 deletions
26
warehouse/templates/email/gpg-signature-uploaded/body.html
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
warehouse/templates/email/gpg-signature-uploaded/subject.txt
This file was deleted.
Oops, something went wrong.