refactor client secret resource

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "python.testing.pytestArgs": ["tests"],
+  "python.testing.unittestEnabled": false,
+  "python.testing.pytestEnabled": true
+}

tests/conftest.py

@@ -1,20 +1,3 @@
 """Conftest fixtures."""
 
-import json
-import os
-
-import pytest
-
-from .utilities import get_secrets_dict
-
 pytest_plugins = ("singer_sdk.testing.pytest_plugin",)
-
-
-@pytest.fixture(scope="module")
-def config():
-    """Write secrets file then clean it up after tests."""
-    secrets_path = f"{os.path.dirname(__file__)}/test_data/client_secrets.json"
-    with open(secrets_path, "w") as f:
-        json.dump(get_secrets_dict(), f)
-    yield
-    os.remove(secrets_path)

tests/test_core.py

@@ -1,22 +1,14 @@
 """Tests standard tap features using the built-in SDK tests library."""
 
-import os
 from datetime import datetime, timedelta, timezone
 
-import pytest
 from singer_sdk.testing import get_tap_test_class
 
 from tap_google_analytics.tap import TapGoogleAnalytics
 
-from .utilities import get_secrets_dict
-
-SAMPLE_CONFIG_SERVICE = {
-    "view_id": "188392047",
-    "end_date": datetime.now(timezone.utc).strftime("%Y-%m-%d"),
-    "start_date": (datetime.now(timezone.utc) - timedelta(days=2)).strftime("%Y-%m-%d"),
-    "key_file_location": f"{os.path.dirname(__file__)}/test_data/client_secrets.json",
-}
+from .utilities import create_secrets_file, get_secrets_dict
 
+# Run standard built-in tap tests from the SDK with SAMPLE_CONFIG_CLIENT_SECRETS
 SAMPLE_CONFIG_CLIENT_SECRETS = {
     "view_id": "188392047",
     "end_date": datetime.now(timezone.utc).strftime("%Y-%m-%d"),
@@ -25,25 +17,22 @@
 }
 
 
-# Run standard built-in tap tests from the SDK with SAMPLE_CONFIG_SERVICE
-TapGoogleAnalyticsService = get_tap_test_class(
-    tap_class=TapGoogleAnalytics, config=SAMPLE_CONFIG_SERVICE
-)
-
-
-class TestTapGoogleAnalyticsService(TapGoogleAnalyticsService):
-    @pytest.fixture
-    def resource(self, config):
-        yield
-
-
-# Run standard built-in tap tests from the SDK with SAMPLE_CONFIG_CLIENT_SECRETS
-TapGoogleAnalyticsClientSecrets = get_tap_test_class(
+TestTapGoogleAnalyticsClientSecrets = get_tap_test_class(
     tap_class=TapGoogleAnalytics, config=SAMPLE_CONFIG_CLIENT_SECRETS
 )
 
 
-class TestTapGoogleAnalyticsClientSecrets(TapGoogleAnalyticsClientSecrets):
-    @pytest.fixture
-    def resource(self, config):
-        yield
+with create_secrets_file() as secrets_file_path:
+    # Run standard built-in tap tests from the SDK with SAMPLE_CONFIG_SERVICE
+    SAMPLE_CONFIG_SERVICE = {
+        "view_id": "188392047",
+        "end_date": datetime.now(timezone.utc).strftime("%Y-%m-%d"),
+        "start_date": (datetime.now(timezone.utc) - timedelta(days=2)).strftime(
+            "%Y-%m-%d"
+        ),
+        "key_file_location": secrets_file_path,
+    }
+
+    TestTapGoogleAnalyticsService = get_tap_test_class(
+        tap_class=TapGoogleAnalytics, config=SAMPLE_CONFIG_SERVICE
+    )

tests/utilities.py

@@ -1,9 +1,20 @@
 """Test utility funtions."""
 import base64
+import contextlib
 import json
 import os
 
 
+@contextlib.contextmanager
+def create_secrets_file():
+    """Write secrets file then clean it up after tests."""
+    secrets_path = f"{os.path.dirname(__file__)}/test_data/client_secrets.json"
+    with open(secrets_path, "w") as f:
+        json.dump(get_secrets_dict(), f)
+    yield secrets_path
+    os.remove(secrets_path)
+
+
 def get_secrets_dict():
     """Return a secrets dictionary of based off the env var."""
     secrets_var = os.environ["CLIENT_SECRETS"]