zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-06-10 14:34:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update tests on common.py

Browse source
This commit is contained in:
Erin 2024-05-02 11:37:03 -07:00
parent 98e61d606d
commit 763e7b6351
No known key found for this signature in database
GPG key ID: 1CAD275313C62460
4 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/registrar/forms/domain_request_wizard.py
View file

@ -13,7 +13,7 @@ from registrar.forms.utility.wizard_form_helper import (
BaseYesNoForm,
BaseDeletableRegistrarForm,
)
from registrar.models import Contact, DomainRequest, DraftDomain, Domain
from registrar.models import Contact, DomainRequest, DraftDomain, Domain, FederalAgency
from registrar.templatetags.url_helpers import public_site_url
from registrar.utility.enums import ValidationReturnType
@ -97,13 +97,16 @@ class OrganizationElectionForm(RegistrarForm):
class OrganizationContactForm(RegistrarForm):
# for federal agencies we also want to know the top-level agency.
federal_agency = forms.ChoiceField(
federal_agency = forms.ModelChoiceField(
label="Federal agency",
# not required because this field won't be filled out unless
# it is a federal agency. Use clean to check programatically
# if it has been filled in when required.
required=False,
choices=[("", "--Select--")] + DomainRequest.AGENCY_CHOICES,
# uncomment to see if modelChoiceField can be an arg later
# required=False,
queryset=FederalAgency.objects.all(),
empty_label="--Select--",
# choices=[("", "--Select--")] + DomainRequest.AGENCY_CHOICES,
)
organization_name = forms.CharField(
label="Organization name",

3
src/registrar/models/domain_information.py
View file

@ -29,9 +29,6 @@ class DomainInformation(TimeStampedModel):
BranchChoices = DomainRequest.BranchChoices
# TODO for #1975: Delete this after we run the new migration
AGENCY_CHOICES = DomainRequest.AGENCY_CHOICES
federal_agency = models.ForeignKey(
"registrar.FederalAgency",
on_delete=models.PROTECT,

24
src/registrar/tests/common.py
View file

@ -26,6 +26,7 @@ from registrar.models import (
DomainInformation,
PublicContact,
Domain,
FederalAgency
)
from epplibwrapper import (
commands,
@ -539,6 +540,9 @@ class MockDb(TestCase):
self.end_date = current_date + timedelta(days=2)
self.start_date = current_date - timedelta(days=2)
self.federal_agency_1, _ = FederalAgency.get_or_create(name="World War I Centennial Commission")
self.federal_agency_2, _ = FederalAgency.get_or_create(name="Armed Forces Retirement Home")
self.domain_1, _ = Domain.objects.get_or_create(
name="cdomain1.gov", state=Domain.State.READY, first_ready=timezone.now()
)
@ -582,7 +586,7 @@ class MockDb(TestCase):
creator=self.user,
domain=self.domain_1,
generic_org_type="federal",
federal_agency="World War I Centennial Commission",
federal_agency=federal_agency_1,
federal_type="executive",
is_election_board=False,
)
@ -593,63 +597,63 @@ class MockDb(TestCase):
creator=self.user,
domain=self.domain_3,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_4, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_4,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_5, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_5,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_6, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_6,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_7, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_7,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_8, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_8,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_9, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_9,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_10, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_10,
generic_org_type="federal",
federal_agency="Armed Forces Retirement Home",
federal_agency=federal_agency_2,
is_election_board=False,
)
self.domain_information_11, _ = DomainInformation.objects.get_or_create(
creator=self.user,
domain=self.domain_11,
generic_org_type="federal",
federal_agency="World War I Centennial Commission",
federal_agency=federal_agency_1,
federal_type="executive",
is_election_board=False,
)

2
src/registrar/tests/test_admin.py
View file

@ -1989,8 +1989,6 @@ class TestDomainRequestAdmin(MockEppLib):
"updated_at",
"status",
"rejection_reason",
"updated_federal_agency",
# TODO: once approved, we'll have to remove above from test
"creator",
"investigator",
"generic_org_type",