fix unit tests drifting from changes

Author: half-ogre

.github/workflows/acceptance.yaml

@@ -22,8 +22,10 @@ jobs:
       - name: Run acceptance tests
         run: pytest tests/acceptance/ -v
         env:
+          HYPHEN_DEV: ${{ vars.HYPHEN_DEV }}
           HYPHEN_API_KEY: ${{ secrets.HYPHEN_API_KEY }}
           HYPHEN_PUBLIC_API_KEY: ${{ secrets.HYPHEN_PUBLIC_API_KEY }}
-          HYPHEN_APPLICATION_ID: ${{ secrets.HYPHEN_APPLICATION_ID }}
-          HYPHEN_ORGANIZATION_ID: ${{ secrets.HYPHEN_ORGANIZATION_ID }}
-          HYPHEN_LINK_DOMAIN: ${{ secrets.HYPHEN_LINK_DOMAIN }}
+          HYPHEN_APPLICATION_ID: ${{ vars.HYPHEN_APPLICATION_ID }}
+          HYPHEN_ORGANIZATION_ID: ${{ vars.HYPHEN_ORGANIZATION_ID }}
+          HYPHEN_PROJECT_ID: ${{ vars.HYPHEN_PROJECT_ID }}
+          HYPHEN_LINK_DOMAIN: ${{ vars.HYPHEN_LINK_DOMAIN }}

hyphen/feature_toggle.py

@@ -63,7 +63,7 @@ def __init__(
             )
 
         self.environment = (
-            environment or os.environ.get("HYPHEN_ENVIRONMENT") or "development"
+            environment or os.environ.get("HYPHEN_ENVIRONMENT") or "production"
         )
         self.default_context = default_context
         self.on_error = on_error

tests/test_feature_toggle.py

@@ -91,10 +91,9 @@ def test_build_payload_with_minimal_context(self) -> None:
 
         payload = toggle._build_payload()
 
-        assert payload == {
-            "application": "the_app_id",
-            "environment": "the_environment",
-        }
+        assert payload["application"] == "the_app_id"
+        assert payload["environment"] == "the_environment"
+        assert "targetingKey" in payload  # Always generated when not provided
 
     def test_build_payload_with_full_context(self) -> None:
         """Test payload building with full context."""

tests/test_link.py

@@ -66,7 +66,7 @@ def test_create_short_code(mock_client_class: Mock) -> None:
 def test_update_short_code(mock_client_class: Mock) -> None:
     """Test update_short_code method returns ShortCode."""
     mock_client = Mock()
-    mock_client.put.return_value = {
+    mock_client.patch.return_value = {
         "id": "sc_123",
         "code": "abc123",
         "long_url": "https://hyphen.ai",
@@ -81,7 +81,7 @@ def test_update_short_code(mock_client_class: Mock) -> None:
 
     assert isinstance(result, ShortCode)
     assert result.title == "Updated"
-    mock_client.put.assert_called_once_with(
+    mock_client.patch.assert_called_once_with(
         "/api/organizations/org_123/link/codes/abc123",
         data={"title": "Updated"}
     )
@@ -152,7 +152,7 @@ def test_get_tags(mock_client_class: Mock) -> None:
 
     assert len(result) == 3
     assert "tag1" in result
-    mock_client.get.assert_called_once_with("/api/organizations/org_123/link/tags")
+    mock_client.get.assert_called_once_with("/api/organizations/org_123/link/codes/tags")
 
 
 @patch("hyphen.link.BaseClient")
@@ -218,7 +218,7 @@ def test_get_qr_code(mock_client_class: Mock) -> None:
 
     assert isinstance(result, QrCode)
     assert result.id == "qr_123"
-    mock_client.get.assert_called_once_with("/api/organizations/org_123/link/codes/abc123/qr/qr_123")
+    mock_client.get.assert_called_once_with("/api/organizations/org_123/link/codes/abc123/qrs/qr_123")
 
 
 @patch("hyphen.link.BaseClient")
@@ -240,7 +240,7 @@ def test_get_qr_codes(mock_client_class: Mock) -> None:
     assert result.total == 2
     assert len(result.data) == 2
     mock_client.get.assert_called_once_with(
-        "/api/organizations/org_123/link/codes/abc123/qr", params=None
+        "/api/organizations/org_123/link/codes/abc123/qrs", params=None
     )
 
 
@@ -255,4 +255,4 @@ def test_delete_qr_code(mock_client_class: Mock) -> None:
     result = link.delete_qr_code("abc123", "qr_123")
 
     assert result is None
-    mock_client.delete.assert_called_once_with("/api/organizations/org_123/link/codes/abc123/qr/qr_123")
+    mock_client.delete.assert_called_once_with("/api/organizations/org_123/link/codes/abc123/qrs/qr_123")

tests/test_net_info.py

@@ -27,7 +27,7 @@ def test_get_ip_info(mock_client_class: Mock) -> None:
     assert result.ip_type == "ipv4"
     assert result.location.country == "United States"
     assert result.location.city == "Mountain View"
-    mock_client.get.assert_called_once_with("/api/net-info/ip/8.8.8.8")
+    mock_client.get.assert_called_once_with("/ip/8.8.8.8")
 
 
 @patch("hyphen.net_info.BaseClient")
@@ -53,10 +53,12 @@ def test_get_ip_info_error(mock_client_class: Mock) -> None:
 def test_get_ip_infos(mock_client_class: Mock) -> None:
     """Test get_ip_infos method returns list of IpInfo."""
     mock_client = Mock()
-    mock_client.post.return_value = [
-        {"ip": "8.8.8.8", "type": "ipv4", "location": {"country": "United States"}},
-        {"ip": "1.1.1.1", "type": "ipv4", "location": {"country": "Australia"}},
-    ]
+    mock_client.post_raw.return_value = {
+        "data": [
+            {"ip": "8.8.8.8", "type": "ipv4", "location": {"country": "United States"}},
+            {"ip": "1.1.1.1", "type": "ipv4", "location": {"country": "Australia"}},
+        ]
+    }
     mock_client_class.return_value = mock_client
 
     net_info = NetInfo(api_key="key_123")
@@ -69,20 +71,19 @@ def test_get_ip_infos(mock_client_class: Mock) -> None:
     assert isinstance(result[1], IpInfo)
     assert result[1].ip == "1.1.1.1"
     assert result[1].location.country == "Australia"
-    mock_client.post.assert_called_once_with(
-        "/api/net-info/ips",
-        data={"ips": ["8.8.8.8", "1.1.1.1"]}
-    )
+    mock_client.post_raw.assert_called_once_with("/ip", data=["8.8.8.8", "1.1.1.1"])
 
 
 @patch("hyphen.net_info.BaseClient")
 def test_get_ip_infos_with_errors(mock_client_class: Mock) -> None:
     """Test get_ip_infos method handles mixed results with errors."""
     mock_client = Mock()
-    mock_client.post.return_value = [
-        {"ip": "8.8.8.8", "type": "ipv4", "location": {"country": "United States"}},
-        {"ip": "invalid", "type": "error", "errorMessage": "Invalid IP"},
-    ]
+    mock_client.post_raw.return_value = {
+        "data": [
+            {"ip": "8.8.8.8", "type": "ipv4", "location": {"country": "United States"}},
+            {"ip": "invalid", "type": "error", "errorMessage": "Invalid IP"},
+        ]
+    }
     mock_client_class.return_value = mock_client
 
     net_info = NetInfo(api_key="key_123")