From 29d1186b667c55a51accc59462d090baebdf708b Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 16 Nov 2023 02:08:14 +0100
Subject: [PATCH] Drop fixtures for loading mock responses

---
 tests/conftest.py                             | 17 ----------
 ... => enheter-details-deleted-response.json} |  0
 ...nse.json => enheter-details-response.json} |  0
 tests/test_enhetsregisteret.py                | 33 +++++++------------
 4 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 tests/conftest.py
 rename tests/data/{deleted-organization-details-response.json => enheter-details-deleted-response.json} (100%)
 rename tests/data/{organization-details-response.json => enheter-details-response.json} (100%)

diff --git a/tests/conftest.py b/tests/conftest.py
deleted file mode 100644
index b669848..0000000
--- a/tests/conftest.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from pathlib import Path
-
-import pytest
-
-TEST_DIR = Path(__file__).parent
-
-
-@pytest.fixture()
-def organization_details_response() -> bytes:
-    filepath = TEST_DIR / "data" / "organization-details-response.json"
-    return filepath.read_bytes()
-
-
-@pytest.fixture()
-def deleted_organization_details_response() -> bytes:
-    filepath = TEST_DIR / "data" / "deleted-organization-details-response.json"
-    return filepath.read_bytes()
diff --git a/tests/data/deleted-organization-details-response.json b/tests/data/enheter-details-deleted-response.json
similarity index 100%
rename from tests/data/deleted-organization-details-response.json
rename to tests/data/enheter-details-deleted-response.json
diff --git a/tests/data/organization-details-response.json b/tests/data/enheter-details-response.json
similarity index 100%
rename from tests/data/organization-details-response.json
rename to tests/data/enheter-details-response.json
diff --git a/tests/test_enhetsregisteret.py b/tests/test_enhetsregisteret.py
index 6912bd2..d9dfe5b 100644
--- a/tests/test_enhetsregisteret.py
+++ b/tests/test_enhetsregisteret.py
@@ -1,4 +1,5 @@
 from datetime import date
+from pathlib import Path
 
 import httpx
 import pytest
@@ -6,17 +7,16 @@
 
 from brreg import BrregRestError, enhetsregisteret
 
+DATA_DIR = Path(__file__).parent / "data"
 
-def test_get_enhet(
-    httpx_mock: HTTPXMock,
-    organization_details_response: bytes,
-) -> None:
+
+def test_get_enhet(httpx_mock: HTTPXMock) -> None:
     httpx_mock.add_response(  # pyright: ignore[reportUnknownMemberType]
         method="GET",
         url="https://data.brreg.no/enhetsregisteret/api/enheter/112233445",
         status_code=200,
         headers={"content-type": "application/json"},
-        content=organization_details_response,
+        content=(DATA_DIR / "enheter-details-response.json").read_bytes(),
     )
 
     org = enhetsregisteret.Client().get_enhet("112233445")
@@ -54,16 +54,13 @@ def test_get_enhet(
     assert org.slettedato is None
 
 
-def test_get_enhet_when_deleted(
-    httpx_mock: HTTPXMock,
-    deleted_organization_details_response: bytes,
-) -> None:
+def test_get_enhet_when_deleted(httpx_mock: HTTPXMock) -> None:
     httpx_mock.add_response(  # pyright: ignore[reportUnknownMemberType]
         method="GET",
         url="https://data.brreg.no/enhetsregisteret/api/enheter/123456789",
         status_code=200,
         headers={"content-type": "application/json"},
-        content=deleted_organization_details_response,
+        content=(DATA_DIR / "enheter-details-deleted-response.json").read_bytes(),
     )
 
     org = enhetsregisteret.Client().get_enhet("123456789")
@@ -79,9 +76,7 @@ def test_get_enhet_when_deleted(
     assert org.slettedato == date(2017, 10, 20)
 
 
-def test_get_enhet_when_gone(
-    httpx_mock: HTTPXMock,
-) -> None:
+def test_get_enhet_when_gone(httpx_mock: HTTPXMock) -> None:
     httpx_mock.add_response(  # pyright: ignore[reportUnknownMemberType]
         method="GET",
         url="https://data.brreg.no/enhetsregisteret/api/enheter/818511752",
@@ -94,9 +89,7 @@ def test_get_enhet_when_gone(
     assert org is None
 
 
-def test_get_enhet_when_not_found(
-    httpx_mock: HTTPXMock,
-) -> None:
+def test_get_enhet_when_not_found(httpx_mock: HTTPXMock) -> None:
     httpx_mock.add_response(  # pyright: ignore[reportUnknownMemberType]
         method="GET",
         url="https://data.brreg.no/enhetsregisteret/api/enheter/818511752",
@@ -109,9 +102,7 @@ def test_get_enhet_when_not_found(
     assert org is None
 
 
-def test_get_enhet_when_http_error(
-    httpx_mock: HTTPXMock,
-) -> None:
+def test_get_enhet_when_http_error(httpx_mock: HTTPXMock) -> None:
     httpx_mock.add_response(  # pyright: ignore[reportUnknownMemberType]
         method="GET",
         url="https://data.brreg.no/enhetsregisteret/api/enheter/818511752",
@@ -133,9 +124,7 @@ def test_get_enhet_when_http_error(
     assert exc_info.value.status_code == 400
 
 
-def test_get_organization_by_number_when_http_timeout(
-    httpx_mock: HTTPXMock,
-) -> None:
+def test_get_organization_by_number_when_http_timeout(httpx_mock: HTTPXMock) -> None:
     httpx_mock.add_exception(  # pyright: ignore[reportUnknownMemberType]
         httpx.ConnectTimeout("Connection refused"),
     )