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

Fix unit test after merge

Browse source
This commit is contained in:
zandercymatics 2024-06-12 09:38:13 -06:00
parent 836b190822
commit fda3503896
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -734,7 +734,7 @@ class ExportDataTest(MockDb, MockEppLib):
csv_file.seek(0) csv_file.seek(0)
# Read the content into a variable # Read the content into a variable
csv_content = csv_file.read() csv_content = csv_file.read()
print(csv_content)
expected_content = ( expected_content = (
# Header # Header
"Domain request,Submitted at,Status,Domain type,Federal type," "Domain request,Submitted at,Status,Domain type,Federal type,"
@ -748,13 +748,13 @@ class ExportDataTest(MockDb, MockEppLib):
"Chief Tester,Purpose of the site,There is more,Testy Tester testy2@town.com,,city.com,\n" "Chief Tester,Purpose of the site,There is more,Testy Tester testy2@town.com,,city.com,\n"
"city3.gov,2024-04-02,Submitted,Federal,Executive,,Testorg,N/A,,NY,2,,,,0,1," "city3.gov,2024-04-02,Submitted,Federal,Executive,,Testorg,N/A,,NY,2,,,,0,1,"
"cheeseville.gov | city1.gov | igorville.gov,Testy,Tester,testy@town.com,Chief Tester," "cheeseville.gov | city1.gov | igorville.gov,Testy,Tester,testy@town.com,Chief Tester,"
"Purpose of the site,test@igorville.com | There is more," "Purpose of the site,test@igorville.com | There is more,Meow Tester24 te2@town.com | "
"Meow Tester24 te2@town.com | Testy1232 Tester24 te2@town.com " "Testy1232 Tester24 te2@town.com | Testy Tester testy2@town.com,test@igorville.com,"
"| Testy Tester testy2@town.com,test@igorville.com,city.com |" "city.com | https://www.example2.com | https://www.example.com,\n"
" https://www.example2.com | https://www.example.com,\n" "city4.gov,2024-04-02,Submitted,City,Executive,,Testorg,Yes,,NY,2,,,,0,1,city1.gov,Testy,Tester,testy@town.com,"
"city5.gov,,Approved,Federal,Executive,,Testorg,N/A,,NY,2,,,,1,0," "Chief Tester,Purpose of the site,There is more,Testy Tester testy2@town.com,,city.com,\n"
"city1.gov,Testy,Tester,testy@town.com,Chief Tester,Purpose of the site,There " "city5.gov,,Approved,Federal,Executive,,Testorg,N/A,,NY,2,,,,1,0,city1.gov,Testy,Tester,testy@town.com,"
"is more,Testy Tester testy2@town.com,,city.com,\n" "Chief Tester,Purpose of the site,There is more,Testy Tester testy2@town.com,,city.com,\n"
"city6.gov,2024-04-02,Submitted,Federal,Executive,,Testorg,N/A,,NY,2,,,,0,1,city1.gov,Testy,Tester," "city6.gov,2024-04-02,Submitted,Federal,Executive,,Testorg,N/A,,NY,2,,,,0,1,city1.gov,Testy,Tester,"
"testy@town.com,Chief Tester,Purpose of the site,There is more,Testy Tester testy2@town.com,,city.com," "testy@town.com,Chief Tester,Purpose of the site,There is more,Testy Tester testy2@town.com,,city.com,"
) )

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

@ -894,9 +894,7 @@ class DomainRequestExport:
# Handle the federal_type field. Defaults to the wrong format. # Handle the federal_type field. Defaults to the wrong format.
federal_type = request.get("federal_type") federal_type = request.get("federal_type")
human_readable_federal_type = ( human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None
BranchChoices.get_branch_label(federal_type) if federal_type else None
)
# Handle the org_type field # Handle the org_type field
org_type = request.get("generic_org_type") or request.get("organization_type") org_type = request.get("generic_org_type") or request.get("organization_type")