zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-13 21:19:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix linting

Browse source
This commit is contained in:
Erin Song 2025-01-27 16:09:53 -08:00
parent 36b90523c9
commit 84c6d192e8
No known key found for this signature in database
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/registrar/tests/test_models_requests.py
View file

@ -17,7 +17,7 @@ from registrar.models import (
AllowedEmail, AllowedEmail,
Portfolio, Portfolio,
Suborganization, Suborganization,
UserPortfolioPermission UserPortfolioPermission,
) )
from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
@ -51,7 +51,10 @@ class TestDomainRequest(TestCase):
) )
self.dummy_user_3, _ = User.objects.get_or_create( self.dummy_user_3, _ = User.objects.get_or_create(
username="portfolioadmin@igorville.com", email="portfolioadmin@igorville.com", first_name="Portfolio", last_name="Admin" username="portfolioadmin@igorville.com",
email="portfolioadmin@igorville.com",
first_name="Portfolio",
last_name="Admin",
) )
self.started_domain_request = completed_domain_request( self.started_domain_request = completed_domain_request(
@ -281,7 +284,14 @@ class TestDomainRequest(TestCase):
self.assertEqual(domain_request.status, domain_request.DomainRequestStatus.SUBMITTED) self.assertEqual(domain_request.status, domain_request.DomainRequestStatus.SUBMITTED)
def check_email_sent( def check_email_sent(
self, domain_request, msg, action, expected_count, expected_content=None, expected_email="mayor@igorville.com", expected_cc=[] self,
domain_request,
msg,
action,
expected_count,
expected_content=None,
expected_email="mayor@igorville.com",
expected_cc=[],
): ):
"""Check if an email was sent after performing an action.""" """Check if an email was sent after performing an action."""
email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email) email_allowed, _ = AllowedEmail.objects.get_or_create(email=expected_email)
@ -301,7 +311,7 @@ class TestDomainRequest(TestCase):
self.assertEqual(len(sent_emails), expected_count) self.assertEqual(len(sent_emails), expected_count)
if expected_cc: if expected_cc:
sent_cc_adddresses = sent_emails[0]["kwargs"]["Destination"]['CcAddresses'] sent_cc_adddresses = sent_emails[0]["kwargs"]["Destination"]["CcAddresses"]
for cc_address in expected_cc: for cc_address in expected_cc:
self.assertIn(cc_address, sent_cc_adddresses) self.assertIn(cc_address, sent_cc_adddresses)
@ -1098,22 +1108,22 @@ class TestDomainRequest(TestCase):
organization_type=DomainRequest.OrganizationChoices.FEDERAL, organization_type=DomainRequest.OrganizationChoices.FEDERAL,
) )
user_portfolio_permission = UserPortfolioPermission.objects.create( user_portfolio_permission = UserPortfolioPermission.objects.create(
user=self.dummy_user_3, user=self.dummy_user_3, portfolio=portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
portfolio=portfolio,
roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
) )
# Adds cc'ed email in this test's allow list # Adds cc'ed email in this test's allow list
AllowedEmail.objects.create(email="portfolioadmin@igorville.com") AllowedEmail.objects.create(email="portfolioadmin@igorville.com")
msg = "Create a domain request and submit it and see if email cc's portfolio admin and members who can view requests." msg = "Create a domain request and submit it and see if email cc's portfolio admin and members who can view requests."
domain_request = completed_domain_request( domain_request = completed_domain_request(
name="test.gov", name="test.gov", user=self.dummy_user_2, portfolio=portfolio, organization_name="Test Portfolio"
user=self.dummy_user_2,
portfolio=portfolio,
organization_name="Test Portfolio"
) )
self.check_email_sent( self.check_email_sent(
domain_request, msg, "submit", 1, expected_email="intern@igorville.com", expected_cc=['portfolioadmin@igorville.com'] domain_request,
msg,
"submit",
1,
expected_email="intern@igorville.com",
expected_cc=["portfolioadmin@igorville.com"],
) )

1
src/registrar/views/domain.py
View file

@ -1338,7 +1338,6 @@ class DomainDeleteUserView(UserDomainRolePermissionDeleteView):
# Email domain managers # Email domain managers
# Add a success message # Add a success message
messages.success(self.request, self.get_success_message(delete_self)) messages.success(self.request, self.get_success_message(delete_self))
return redirect(self.get_success_url()) return redirect(self.get_success_url())