Skip to content

Commit

Permalink
fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
asaki222 committed Nov 6, 2024
1 parent 1ca5142 commit 9a5ed14
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions src/registrar/tests/test_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,7 @@ def test_domain_unmanaged(self):
def test_domain_request_growth(self):
"""Shows submitted requests within a date range, sorted"""
# Remove "Submitted at" because we can't guess this immutable, dynamically generated test data
print("we are in here")
columns = [
"Domain request",
"Domain type",
Expand All @@ -692,15 +693,19 @@ def test_domain_request_growth(self):
# Create a CSV file in memory
csv_file = StringIO()
# Call the export functions
print("something")
DomainRequestGrowth.export_data_to_csv(
csv_file,
start_date=self.start_date.strftime("%Y-%m-%d"),
end_date=self.end_date.strftime("%Y-%m-%d"),
)
# Reset the CSV file's position to the beginning
csv_file.seek(0)
print("uuuuu")
print(csv_file)
# Read the content into a variable
csv_content = csv_file.read()
print(csv_content)
expected_content = (
"Domain request,Domain type,Federal type\n"
"city3.gov,Federal,Executive\n"
Expand Down
6 changes: 3 additions & 3 deletions src/registrar/utility/csv_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -1265,19 +1265,19 @@ def parse_row(cls, columns, model):
"""

# Handle the federal_type field. Defaults to the wrong format.
federal_type = model.converted_federal_type
federal_type = model.get("federal_type")
human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None

# Handle the org_type field
org_type = model.converted_generic_org_type
org_type = model.get("generic_org_type")
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.
status = model.get("status")
status_display = DomainRequest.DomainRequestStatus.get_status_label(status) if status else None

# Handle the region field.
state_territory = model.converted_state_territory
state_territory = model.get("state_territory")
region = get_region(state_territory) if state_territory else None

# Handle the requested_domain field (add a default if None)
Expand Down

0 comments on commit 9a5ed14

Please sign in to comment.