Skip to content

Commit 3839ce1

Browse files
waseem18waseem18
committed
Removed site name from email subject and body - Addressed code reviews
Ran the command 'make reformat'
1 parent 6bcef52 commit 3839ce1

12 files changed

+187
-394
lines changed

‎tests/unit/email/test_init.py

Lines changed: 78 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -467,280 +467,214 @@ def test_added_as_collaborator_email(
467467
class TestRemovedAsCollaboratorEmail:
468468

469469
def test_removed_as_collaborator_email(
470-
self, pyramid_request, pyramid_config, monkeypatch):
470+
self, pyramid_request, pyramid_config, monkeypatch
471+
):
471472

472-
stub_user = pretend.stub(
473-
email='email',
474-
username='username',
475-
)
473+
stub_user = pretend.stub(email="email", username="username")
476474
stub_submitter_user = pretend.stub(
477-
email='submiteremail',
478-
username='submitterusername'
475+
email="submiteremail", username="submitterusername"
479476
)
480477
stub_role = pretend.stub(
481-
role_name="Owner",
482-
user=stub_user,
483-
project=pretend.stub(
484-
name="test_project"
485-
),
478+
role_name="Owner", user=stub_user, project=pretend.stub(name="test_project")
486479
)
487480
pyramid_request.user = stub_submitter_user
488481

489482
subject_renderer = pyramid_config.testing_add_renderer(
490-
'email/removed-as-collaborator.subject.txt'
483+
"email/removed-as-collaborator.subject.txt"
491484
)
492-
subject_renderer.string_response = 'Email Subject'
485+
subject_renderer.string_response = "Email Subject"
493486
body_renderer = pyramid_config.testing_add_renderer(
494-
'email/removed-as-collaborator.body.txt'
487+
"email/removed-as-collaborator.body.txt"
495488
)
496-
body_renderer.string_response = 'Email Body'
489+
body_renderer.string_response = "Email Body"
497490

498491
send_email = pretend.stub(
499492
delay=pretend.call_recorder(lambda *args, **kwargs: None)
500493
)
501-
pyramid_request.task = pretend.call_recorder(
502-
lambda *args, **kwargs: send_email
503-
)
504-
monkeypatch.setattr(email, 'send_email', send_email)
494+
pyramid_request.task = pretend.call_recorder(lambda *args, **kwargs: send_email)
495+
monkeypatch.setattr(email, "send_email", send_email)
505496

506-
result = email.send_removed_from_role_email(
507-
pyramid_request,
508-
role=stub_role,
509-
)
497+
result = email.send_removed_from_role_email(pyramid_request, role=stub_role)
510498

511499
assert result == {
512-
'project': 'test_project',
513-
'role': 'Owner',
514-
'submitter': stub_submitter_user.username
500+
"project": "test_project",
501+
"role": "Owner",
502+
"submitter": stub_submitter_user.username,
515503
}
516504
subject_renderer.assert_()
517505
body_renderer.assert_(submitter=stub_submitter_user.username)
518-
body_renderer.assert_(project='test_project')
519-
body_renderer.assert_(role='Owner')
506+
body_renderer.assert_(project="test_project")
507+
body_renderer.assert_(role="Owner")
520508

521-
assert pyramid_request.task.calls == [
522-
pretend.call(send_email),
523-
]
509+
assert pyramid_request.task.calls == [pretend.call(send_email)]
524510
assert send_email.delay.calls == [
525-
pretend.call(
526-
'Email Subject',
527-
'Email Body',
528-
recipient=stub_user.email,
529-
),
511+
pretend.call("Email Subject", "Email Body", recipient=stub_user.email)
530512
]
531513

532514

533515
class TestUserRoleChangedEmail:
534516

535517
def test_user_role_changed_email(
536-
self, pyramid_request, pyramid_config, monkeypatch):
518+
self, pyramid_request, pyramid_config, monkeypatch
519+
):
537520

538-
stub_user = pretend.stub(
539-
email='email',
540-
username='username',
541-
)
521+
stub_user = pretend.stub(email="email", username="username")
542522
stub_submitter_user = pretend.stub(
543-
email='submiteremail',
544-
username='submitterusername'
523+
email="submiteremail", username="submitterusername"
545524
)
546525
stub_role = pretend.stub(
547-
role_name="Owner",
548-
user=stub_user,
549-
project=pretend.stub(
550-
name="test_project"
551-
),
526+
role_name="Owner", user=stub_user, project=pretend.stub(name="test_project")
552527
)
553528
pyramid_request.user = stub_submitter_user
554529

555530
subject_renderer = pyramid_config.testing_add_renderer(
556-
'email/role-removed-from-user.subject.txt'
531+
"email/role-removed-from-user.subject.txt"
557532
)
558-
subject_renderer.string_response = 'Email Subject'
533+
subject_renderer.string_response = "Email Subject"
559534
body_renderer = pyramid_config.testing_add_renderer(
560-
'email/role-removed-from-user.body.txt'
535+
"email/role-removed-from-user.body.txt"
561536
)
562-
body_renderer.string_response = 'Email Body'
537+
body_renderer.string_response = "Email Body"
563538

564539
send_email = pretend.stub(
565540
delay=pretend.call_recorder(lambda *args, **kwargs: None)
566541
)
567-
pyramid_request.task = pretend.call_recorder(
568-
lambda *args, **kwargs: send_email
569-
)
570-
monkeypatch.setattr(email, 'send_email', send_email)
542+
pyramid_request.task = pretend.call_recorder(lambda *args, **kwargs: send_email)
543+
monkeypatch.setattr(email, "send_email", send_email)
571544

572545
result = email.send_role_removed_from_user_email(
573546
pyramid_request,
574547
role=stub_role,
575-
email_recipients=[stub_user.email, stub_submitter_user.email]
548+
email_recipients=[stub_user.email, stub_submitter_user.email],
576549
)
577550

578551
assert result == {
579-
'project': 'test_project',
580-
'role': 'Owner',
581-
'submitter': stub_submitter_user.username,
582-
'username': stub_user.username,
552+
"project": "test_project",
553+
"role": "Owner",
554+
"submitter": stub_submitter_user.username,
555+
"username": stub_user.username,
583556
}
584557
subject_renderer.assert_()
585558
body_renderer.assert_(submitter=stub_submitter_user.username)
586-
body_renderer.assert_(project='test_project')
587-
body_renderer.assert_(role='Owner')
559+
body_renderer.assert_(project="test_project")
560+
body_renderer.assert_(role="Owner")
588561

589562
assert pyramid_request.task.calls == [
590563
pretend.call(send_email),
591564
pretend.call(send_email),
592565
]
593566

594567
assert send_email.delay.calls == [
568+
pretend.call("Email Subject", "Email Body", recipient=stub_user.email),
595569
pretend.call(
596-
'Email Subject',
597-
'Email Body',
598-
recipient=stub_user.email,
599-
),
600-
pretend.call(
601-
'Email Subject',
602-
'Email Body',
603-
recipient=stub_submitter_user.email,
570+
"Email Subject", "Email Body", recipient=stub_submitter_user.email
604571
),
605572
]
606573

607574

608575
class TestUserRoleChangedEmailEmail:
609576

610577
def test_user_role_changed_email(
611-
self, pyramid_request, pyramid_config, monkeypatch):
578+
self, pyramid_request, pyramid_config, monkeypatch
579+
):
612580

613-
stub_user = pretend.stub(
614-
email='email',
615-
username='username',
616-
)
581+
stub_user = pretend.stub(email="email", username="username")
617582
stub_submitter_user = pretend.stub(
618-
email='submiteremail',
619-
username='submitterusername'
583+
email="submiteremail", username="submitterusername"
620584
)
621585
stub_role = pretend.stub(
622-
role_name="Owner",
623-
user=stub_user,
624-
project=pretend.stub(
625-
name="test_project"
626-
),
586+
role_name="Owner", user=stub_user, project=pretend.stub(name="test_project")
627587
)
628588
pyramid_request.user = stub_submitter_user
629589

630590
subject_renderer = pyramid_config.testing_add_renderer(
631-
'email/user-role-changed.subject.txt'
591+
"email/user-role-changed.subject.txt"
632592
)
633-
subject_renderer.string_response = 'Email Subject'
593+
subject_renderer.string_response = "Email Subject"
634594
body_renderer = pyramid_config.testing_add_renderer(
635-
'email/user-role-changed.body.txt'
595+
"email/user-role-changed.body.txt"
636596
)
637-
body_renderer.string_response = 'Email Body'
597+
body_renderer.string_response = "Email Body"
638598

639599
send_email = pretend.stub(
640600
delay=pretend.call_recorder(lambda *args, **kwargs: None)
641601
)
642-
pyramid_request.task = pretend.call_recorder(
643-
lambda *args, **kwargs: send_email
644-
)
645-
monkeypatch.setattr(email, 'send_email', send_email)
602+
pyramid_request.task = pretend.call_recorder(lambda *args, **kwargs: send_email)
603+
monkeypatch.setattr(email, "send_email", send_email)
646604

647-
result = email.send_user_role_changed_email(
648-
pyramid_request,
649-
role=stub_role,
650-
)
605+
result = email.send_user_role_changed_email(pyramid_request, role=stub_role)
651606

652607
assert result == {
653-
'project': 'test_project',
654-
'role': 'Owner',
655-
'submitter': stub_submitter_user.username
608+
"project": "test_project",
609+
"role": "Owner",
610+
"submitter": stub_submitter_user.username,
656611
}
657612
subject_renderer.assert_()
658613
body_renderer.assert_(submitter=stub_submitter_user.username)
659-
body_renderer.assert_(project='test_project')
660-
body_renderer.assert_(role='Owner')
614+
body_renderer.assert_(project="test_project")
615+
body_renderer.assert_(role="Owner")
661616

662-
assert pyramid_request.task.calls == [
663-
pretend.call(send_email),
664-
]
617+
assert pyramid_request.task.calls == [pretend.call(send_email)]
665618
assert send_email.delay.calls == [
666-
pretend.call(
667-
'Email Subject',
668-
'Email Body',
669-
recipient=stub_user.email,
670-
),
619+
pretend.call("Email Subject", "Email Body", recipient=stub_user.email)
671620
]
672621

673622

674623
class TestRoleChangedForUserEmail:
675624

676625
def test_role_changed_for_user_email(
677-
self, pyramid_request, pyramid_config, monkeypatch):
626+
self, pyramid_request, pyramid_config, monkeypatch
627+
):
678628

679-
stub_user = pretend.stub(
680-
email='email',
681-
username='username',
682-
)
629+
stub_user = pretend.stub(email="email", username="username")
683630
stub_submitter_user = pretend.stub(
684-
email='submiteremail',
685-
username='submitterusername'
631+
email="submiteremail", username="submitterusername"
686632
)
687633
stub_role = pretend.stub(
688-
role_name="Owner",
689-
user=stub_user,
690-
project=pretend.stub(
691-
name="test_project"
692-
),
634+
role_name="Owner", user=stub_user, project=pretend.stub(name="test_project")
693635
)
694636
pyramid_request.user = stub_submitter_user
695637

696638
subject_renderer = pyramid_config.testing_add_renderer(
697-
'email/role-changed-for-user.subject.txt'
639+
"email/role-changed-for-user.subject.txt"
698640
)
699-
subject_renderer.string_response = 'Email Subject'
641+
subject_renderer.string_response = "Email Subject"
700642
body_renderer = pyramid_config.testing_add_renderer(
701-
'email/role-changed-for-user.body.txt'
643+
"email/role-changed-for-user.body.txt"
702644
)
703-
body_renderer.string_response = 'Email Body'
645+
body_renderer.string_response = "Email Body"
704646

705647
send_email = pretend.stub(
706648
delay=pretend.call_recorder(lambda *args, **kwargs: None)
707649
)
708-
pyramid_request.task = pretend.call_recorder(
709-
lambda *args, **kwargs: send_email
710-
)
711-
monkeypatch.setattr(email, 'send_email', send_email)
650+
pyramid_request.task = pretend.call_recorder(lambda *args, **kwargs: send_email)
651+
monkeypatch.setattr(email, "send_email", send_email)
712652

713653
result = email.send_role_changed_for_user_email(
714654
pyramid_request,
715655
role=stub_role,
716-
email_recipients=[stub_user.email, stub_submitter_user.email]
656+
email_recipients=[stub_user.email, stub_submitter_user.email],
717657
)
718658

719659
assert result == {
720-
'project': 'test_project',
721-
'role': 'Owner',
722-
'submitter': stub_submitter_user.username,
723-
'username': stub_user.username,
660+
"project": "test_project",
661+
"role": "Owner",
662+
"submitter": stub_submitter_user.username,
663+
"username": stub_user.username,
724664
}
725665
subject_renderer.assert_()
726666
body_renderer.assert_(submitter=stub_submitter_user.username)
727-
body_renderer.assert_(project='test_project')
728-
body_renderer.assert_(role='Owner')
667+
body_renderer.assert_(project="test_project")
668+
body_renderer.assert_(role="Owner")
729669

730670
assert pyramid_request.task.calls == [
731671
pretend.call(send_email),
732672
pretend.call(send_email),
733673
]
734674

735675
assert send_email.delay.calls == [
676+
pretend.call("Email Subject", "Email Body", recipient=stub_user.email),
736677
pretend.call(
737-
'Email Subject',
738-
'Email Body',
739-
recipient=stub_user.email,
740-
),
741-
pretend.call(
742-
'Email Subject',
743-
'Email Body',
744-
recipient=stub_submitter_user.email,
678+
"Email Subject", "Email Body", recipient=stub_submitter_user.email
745679
),
746680
]

0 commit comments

Comments
 (0)