mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-24 03:30:50 +02:00
Fix unit tests
This commit is contained in:
parent
002cfba35b
commit
2a93750551
6 changed files with 12 additions and 15 deletions
|
@ -3,14 +3,7 @@ import random
|
||||||
from faker import Faker
|
from faker import Faker
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
|
||||||
from registrar.models import (
|
from registrar.models import User, DomainRequest, DraftDomain, Contact, Website, FederalAgency
|
||||||
User,
|
|
||||||
DomainRequest,
|
|
||||||
DraftDomain,
|
|
||||||
Contact,
|
|
||||||
Website,
|
|
||||||
FederalAgency
|
|
||||||
)
|
|
||||||
|
|
||||||
fake = Faker()
|
fake = Faker()
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
|
@ -26,7 +26,7 @@ from registrar.models import (
|
||||||
DomainInformation,
|
DomainInformation,
|
||||||
PublicContact,
|
PublicContact,
|
||||||
Domain,
|
Domain,
|
||||||
FederalAgency
|
FederalAgency,
|
||||||
)
|
)
|
||||||
from epplibwrapper import (
|
from epplibwrapper import (
|
||||||
commands,
|
commands,
|
||||||
|
|
|
@ -1989,6 +1989,7 @@ class TestDomainRequestAdmin(MockEppLib):
|
||||||
"updated_at",
|
"updated_at",
|
||||||
"status",
|
"status",
|
||||||
"rejection_reason",
|
"rejection_reason",
|
||||||
|
"federal_agency",
|
||||||
"creator",
|
"creator",
|
||||||
"investigator",
|
"investigator",
|
||||||
"generic_org_type",
|
"generic_org_type",
|
||||||
|
@ -1997,7 +1998,6 @@ class TestDomainRequestAdmin(MockEppLib):
|
||||||
"federally_recognized_tribe",
|
"federally_recognized_tribe",
|
||||||
"state_recognized_tribe",
|
"state_recognized_tribe",
|
||||||
"tribe_name",
|
"tribe_name",
|
||||||
"federal_agency",
|
|
||||||
"federal_type",
|
"federal_type",
|
||||||
"organization_name",
|
"organization_name",
|
||||||
"address_line1",
|
"address_line1",
|
||||||
|
|
|
@ -11,7 +11,7 @@ from registrar.models import (
|
||||||
TransitionDomain,
|
TransitionDomain,
|
||||||
DomainInformation,
|
DomainInformation,
|
||||||
UserDomainRole,
|
UserDomainRole,
|
||||||
FederalAgency
|
FederalAgency,
|
||||||
)
|
)
|
||||||
|
|
||||||
from django.core.management import call_command
|
from django.core.management import call_command
|
||||||
|
@ -815,7 +815,7 @@ class TestMigrations(TestCase):
|
||||||
fakewebsite = fakewebsite_domain_infos.get()
|
fakewebsite = fakewebsite_domain_infos.get()
|
||||||
self.assertEqual(fakewebsite.organization_name, "Fanoodle")
|
self.assertEqual(fakewebsite.organization_name, "Fanoodle")
|
||||||
self.assertEqual(fakewebsite.generic_org_type, "federal")
|
self.assertEqual(fakewebsite.generic_org_type, "federal")
|
||||||
self.assertEqual(fakewebsite.federal_agency, "Department of Commerce")
|
self.assertEqual(fakewebsite.federal_agency.agency, "Department of Commerce")
|
||||||
self.assertEqual(fakewebsite.federal_type, "executive")
|
self.assertEqual(fakewebsite.federal_type, "executive")
|
||||||
|
|
||||||
ao = fakewebsite.authorizing_official
|
ao = fakewebsite.authorizing_official
|
||||||
|
|
|
@ -31,6 +31,7 @@ from registrar.models import (
|
||||||
HostIP,
|
HostIP,
|
||||||
UserDomainRole,
|
UserDomainRole,
|
||||||
User,
|
User,
|
||||||
|
FederalAgency,
|
||||||
)
|
)
|
||||||
from datetime import date, datetime, timedelta
|
from datetime import date, datetime, timedelta
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
@ -1426,7 +1427,8 @@ class TestDomainOrganization(TestDomainOverview):
|
||||||
self.domain_information.generic_org_type = fed_org_type
|
self.domain_information.generic_org_type = fed_org_type
|
||||||
self.domain_information.save()
|
self.domain_information.save()
|
||||||
try:
|
try:
|
||||||
self.domain_information.federal_agency = "AMTRAK"
|
federal_agency, _ = FederalAgency.objects.get_or_create(agency="AMTRAK")
|
||||||
|
self.domain_information.federal_agency = federal_agency
|
||||||
self.domain_information.save()
|
self.domain_information.save()
|
||||||
except ValueError as err:
|
except ValueError as err:
|
||||||
self.fail(f"A ValueError was caught during the test: {err}")
|
self.fail(f"A ValueError was caught during the test: {err}")
|
||||||
|
@ -1482,7 +1484,9 @@ class TestDomainOrganization(TestDomainOverview):
|
||||||
self.domain_information.generic_org_type = federal_org_type
|
self.domain_information.generic_org_type = federal_org_type
|
||||||
self.domain_information.save()
|
self.domain_information.save()
|
||||||
|
|
||||||
old_federal_agency_value = ("AMTRAK", "AMTRAK")
|
federal_agency, _ = FederalAgency.objects.get_or_create(agency="AMTRAK")
|
||||||
|
|
||||||
|
old_federal_agency_value = (federal_agency, federal_agency)
|
||||||
try:
|
try:
|
||||||
# Add a federal agency. Defined as a tuple since this list may change order.
|
# Add a federal agency. Defined as a tuple since this list may change order.
|
||||||
self.domain_information.federal_agency = old_federal_agency_value
|
self.domain_information.federal_agency = old_federal_agency_value
|
||||||
|
|
|
@ -16,7 +16,7 @@ from registrar.models import (
|
||||||
Contact,
|
Contact,
|
||||||
User,
|
User,
|
||||||
Website,
|
Website,
|
||||||
FederalAgency
|
FederalAgency,
|
||||||
)
|
)
|
||||||
from registrar.views.domain_request import DomainRequestWizard, Step
|
from registrar.views.domain_request import DomainRequestWizard, Step
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue