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

Linting changes

Browse source
This commit is contained in:
zandercymatics 2023-11-28 11:43:06 -07:00
parent 14355327b2
commit 2faad04e9e
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/views.py
View file

@ -94,8 +94,6 @@ def available(request, domain=""):
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@login_not_required @login_not_required
def get_current_full(request, file_path="migrationdata/current-full.csv"): def get_current_full(request, file_path="migrationdata/current-full.csv"):
# Open the CSV file
file_path = "migrationdata/current-full.csv"
return serve_file(file_path) return serve_file(file_path)

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

@ -1,5 +1,4 @@
import csv import csv
from unittest import skip
from django.test import Client, RequestFactory, TestCase from django.test import Client, RequestFactory, TestCase
from io import StringIO from io import StringIO
from registrar.models.domain_information import DomainInformation from registrar.models.domain_information import DomainInformation
@ -88,9 +87,9 @@ class CsvReportsTest(TestCase):
def test_generate_federal_report(self): def test_generate_federal_report(self):
"""Ensures that we correctly generate current-federal.csv""" """Ensures that we correctly generate current-federal.csv"""
expected_file_content = [ expected_file_content = [
call("Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\r\n"), call("Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\n"),
call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,, \r\n"), call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,, \n"),
call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,, \r\n"), call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,, \n"),
] ]
fake_open = mock_open() fake_open = mock_open()
# We don't actually want to write anything for a test case, # We don't actually want to write anything for a test case,
@ -104,10 +103,10 @@ class CsvReportsTest(TestCase):
def test_generate_full_report(self): def test_generate_full_report(self):
"""Ensures that we correctly generate current-full.csv""" """Ensures that we correctly generate current-full.csv"""
expected_file_content = [ expected_file_content = [
call(f"Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\r\n"), call("Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\n"),
call(f"cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,, \r\n"), call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,, \n"),
call(f"ddomain3.gov,Federal,Armed Forces Retirement Home,,,, \r\n"), call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,, \n"),
call(f"adomain2.gov,Interstate,,,,, \r\n"), call("adomain2.gov,Interstate,,,,, \n"),
] ]
fake_open = mock_open() fake_open = mock_open()
# We don't actually want to write anything for a test case, # We don't actually want to write anything for a test case,
@ -146,9 +145,9 @@ class CsvReportsTest(TestCase):
# Check that the response contains what we expect # Check that the response contains what we expect
file_content = b"".join(response.streaming_content).decode("utf-8") file_content = b"".join(response.streaming_content).decode("utf-8")
expected_file_content = ( expected_file_content = (
f"Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\r\n" "Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\n"
f"cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,\r\n" "cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,\n"
f"ddomain3.gov,Federal,Armed Forces Retirement Home,,,," "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,"
) )
self.assertEqual(file_content, expected_file_content) self.assertEqual(file_content, expected_file_content)
@ -157,16 +156,16 @@ class CsvReportsTest(TestCase):
"""Tests the current-federal api link""" """Tests the current-federal api link"""
self.maxDiff = None self.maxDiff = None
request = self.factory.get("/fake-path") request = self.factory.get("/fake-path")
response = get_current_federal(request, file_path="registrar/tests/data/fake_current_full.csv") response = get_current_full(request, file_path="registrar/tests/data/fake_current_full.csv")
# Check that the response has status code 200 # Check that the response has status code 200
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
# Check that the response contains what we expect # Check that the response contains what we expect
file_content = b"".join(response.streaming_content).decode("utf-8") file_content = b"".join(response.streaming_content).decode("utf-8")
expected_file_content = ( expected_file_content = (
f"Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\r\n" "Domain name,Domain type,Agency,Organization name,City,State,Security Contact Email\n"
f"cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,\r\n" "cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,\n"
f"ddomain3.gov,Federal,Armed Forces Retirement Home,,,,\r\n" "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,\n"
f"adomain2.gov,Interstate,,,,," "adomain2.gov,Interstate,,,,,"
) )
self.assertEqual(file_content, expected_file_content) self.assertEqual(file_content, expected_file_content)