zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-29 17:00:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

tweak tests and linter

Browse source
This commit is contained in:
Rachid Mrad 2023-10-31 11:14:18 -04:00
parent 8e768112f3
commit 1cb0127dfb
No known key found for this signature in database
GPG key ID: EF38E4CEC4A8F3CF
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/registrar/tests/test_reports.py
View file

@ -39,6 +39,7 @@ class ExportDataTest(TestCase):
domain=self.domain_1, domain=self.domain_1,
organization_type="federal", organization_type="federal",
federal_agency="World War I Centennial Commission", federal_agency="World War I Centennial Commission",
federal_type="executive",
) )
self.domain_information_2, _ = DomainInformation.objects.get_or_create( self.domain_information_2, _ = DomainInformation.objects.get_or_create(
creator=self.user, creator=self.user,
@ -114,7 +115,7 @@ class ExportDataTest(TestCase):
"AO email,Submitter,Submitter title,Submitter email,Submitter phone," "AO email,Submitter,Submitter title,Submitter email,Submitter phone,"
"Security Contact Email,Status\n" "Security Contact Email,Status\n"
"adomain2.gov,Interstate,dnsneeded\n" "adomain2.gov,Interstate,dnsneeded\n"
"cdomain1.gov,Federal,World War I Centennial Commission,ready\n" "cdomain1.gov,Federal - Executive,World War I Centennial Commission,ready\n"
"ddomain3.gov,Federal,Armed Forces Retirement Home,onhold\n" "ddomain3.gov,Federal,Armed Forces Retirement Home,onhold\n"
) )
@ -174,7 +175,7 @@ class ExportDataTest(TestCase):
expected_content = ( expected_content = (
"Domain name,Domain type,Federal agency,Organization name,City," "Domain name,Domain type,Federal agency,Organization name,City,"
"State,Security Contact Email\n" "State,Security Contact Email\n"
"cdomain1.gov,Federal,World War I Centennial Commission\n" "cdomain1.gov,Federal - Executive,World War I Centennial Commission\n"
"ddomain3.gov,Federal,Armed Forces Retirement Home\n" "ddomain3.gov,Federal,Armed Forces Retirement Home\n"
) )

3
src/registrar/utility/csv_export.py
View file

@ -20,7 +20,8 @@ def export_domains_to_writer(writer, columns, sort_fields, filter_condition):
FIELDS = { FIELDS = {
"Domain name": domainInfo.domain.name, "Domain name": domainInfo.domain.name,
"Domain type": domainInfo.get_organization_type_display() "Domain type": domainInfo.get_organization_type_display()
+ " - " + domainInfo.federal_type + " - "
+ domainInfo.get_federal_type_display()
if domainInfo.federal_type if domainInfo.federal_type
else domainInfo.get_organization_type_display(), else domainInfo.get_organization_type_display(),
"Federal agency": domainInfo.federal_agency, "Federal agency": domainInfo.federal_agency,