mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-10 21:23:32 +02:00
updates
This commit is contained in:
parent
9a5ed14e88
commit
45f8a85348
2 changed files with 2 additions and 6 deletions
|
@ -682,7 +682,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
|
||||||
def test_domain_request_growth(self):
|
def test_domain_request_growth(self):
|
||||||
"""Shows submitted requests within a date range, sorted"""
|
"""Shows submitted requests within a date range, sorted"""
|
||||||
# Remove "Submitted at" because we can't guess this immutable, dynamically generated test data
|
# Remove "Submitted at" because we can't guess this immutable, dynamically generated test data
|
||||||
print("we are in here")
|
|
||||||
columns = [
|
columns = [
|
||||||
"Domain request",
|
"Domain request",
|
||||||
"Domain type",
|
"Domain type",
|
||||||
|
@ -693,7 +692,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
|
||||||
# Create a CSV file in memory
|
# Create a CSV file in memory
|
||||||
csv_file = StringIO()
|
csv_file = StringIO()
|
||||||
# Call the export functions
|
# Call the export functions
|
||||||
print("something")
|
|
||||||
DomainRequestGrowth.export_data_to_csv(
|
DomainRequestGrowth.export_data_to_csv(
|
||||||
csv_file,
|
csv_file,
|
||||||
start_date=self.start_date.strftime("%Y-%m-%d"),
|
start_date=self.start_date.strftime("%Y-%m-%d"),
|
||||||
|
@ -701,11 +699,9 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
|
||||||
)
|
)
|
||||||
# Reset the CSV file's position to the beginning
|
# Reset the CSV file's position to the beginning
|
||||||
csv_file.seek(0)
|
csv_file.seek(0)
|
||||||
print("uuuuu")
|
|
||||||
print(csv_file)
|
|
||||||
# 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 = (
|
||||||
"Domain request,Domain type,Federal type\n"
|
"Domain request,Domain type,Federal type\n"
|
||||||
"city3.gov,Federal,Executive\n"
|
"city3.gov,Federal,Executive\n"
|
||||||
|
|
|
@ -1269,7 +1269,7 @@ class DomainRequestExport(BaseExport):
|
||||||
human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None
|
human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None
|
||||||
|
|
||||||
# Handle the org_type field
|
# Handle the org_type field
|
||||||
org_type = model.get("generic_org_type")
|
org_type = model.get("generic_org_type") or model.get("organization_type")
|
||||||
human_readable_org_type = DomainRequest.OrganizationChoices.get_org_label(org_type) if org_type else None
|
human_readable_org_type = DomainRequest.OrganizationChoices.get_org_label(org_type) if org_type else None
|
||||||
|
|
||||||
# Handle the status field. Defaults to the wrong format.
|
# Handle the status field. Defaults to the wrong format.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue