Continue standardizing on mock_response_factory

- Update more test files to use mock_response_factory consistently
- Replace direct manipulations of mock_response with factory usage in:
  - nutrition/test_get_food.py
  - nutrition/test_get_food_goals.py
  - friends/test_get_friends_leaderboard.py
  - nutrition/test_delete_meal.py
  - activity_timeseries/test_get_activity_timeseries.py
  - active_zone_minutes/test_get_azm_timeseries_by_date.py

Author: jpstroop

tests/fitbit_client/resources/active_zone_minutes/test_get_azm_timeseries_by_date.py

@@ -13,21 +13,24 @@
 from fitbit_client.resources._constants import Period
 
 
-def test_get_azm_timeseries_by_date_success(azm_resource, mock_response):
+def test_get_azm_timeseries_by_date_success(azm_resource, mock_response_factory):
     """Test successful retrieval of AZM time series by date with default period"""
-    mock_response.json.return_value = {
-        "activities-active-zone-minutes": [
-            {
-                "dateTime": "2025-02-01",
-                "value": {
-                    "activeZoneMinutes": 102,
-                    "fatBurnActiveZoneMinutes": 90,
-                    "cardioActiveZoneMinutes": 8,
-                    "peakActiveZoneMinutes": 4,
-                },
-            }
-        ]
-    }
+    mock_response = mock_response_factory(
+        200,
+        {
+            "activities-active-zone-minutes": [
+                {
+                    "dateTime": "2025-02-01",
+                    "value": {
+                        "activeZoneMinutes": 102,
+                        "fatBurnActiveZoneMinutes": 90,
+                        "cardioActiveZoneMinutes": 8,
+                        "peakActiveZoneMinutes": 4,
+                    },
+                }
+            ]
+        },
+    )
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_date(date="2025-02-01")
     assert result == mock_response.json.return_value
@@ -41,9 +44,9 @@ def test_get_azm_timeseries_by_date_success(azm_resource, mock_response):
     )
 
 
-def test_get_azm_timeseries_by_date_explicit_period(azm_resource, mock_response):
+def test_get_azm_timeseries_by_date_explicit_period(azm_resource, mock_response_factory):
     """Test successful retrieval of AZM time series by date with explicit ONE_DAY period"""
-    mock_response.json.return_value = {"activities-active-zone-minutes": []}
+    mock_response = mock_response_factory(200, {"activities-active-zone-minutes": []})
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_date(date="2025-02-01", period=Period.ONE_DAY)
     assert result == mock_response.json.return_value
@@ -57,9 +60,9 @@ def test_get_azm_timeseries_by_date_explicit_period(azm_resource, mock_response)
     )
 
 
-def test_get_azm_timeseries_by_date_with_user_id(azm_resource, mock_response):
+def test_get_azm_timeseries_by_date_with_user_id(azm_resource, mock_response_factory):
     """Test getting AZM time series for a specific user"""
-    mock_response.json.return_value = {"activities-active-zone-minutes": []}
+    mock_response = mock_response_factory(200, {"activities-active-zone-minutes": []})
     azm_resource.oauth.request.return_value = mock_response
     result = azm_resource.get_azm_timeseries_by_date(date="2025-02-01", user_id="123ABC")
     assert result == mock_response.json.return_value

tests/fitbit_client/resources/activity_timeseries/test_get_activity_timeseries.py

@@ -9,9 +9,11 @@
 from fitbit_client.resources._constants import Period
 
 
-def test_get_activity_timeseries_with_today_date(activity_timeseries_resource, mock_response):
+def test_get_activity_timeseries_with_today_date(
+    activity_timeseries_resource, mock_response_factory
+):
     """Test using 'today' as the date parameter"""
-    mock_response.json.return_value = {"activities-steps": []}
+    mock_response = mock_response_factory(200, {"activities-steps": []})
     activity_timeseries_resource.oauth.request.return_value = mock_response
     activity_timeseries_resource.get_activity_timeseries_by_date(
         resource_path=ActivityTimeSeriesPath.STEPS, date="today", period=Period.ONE_DAY
@@ -26,9 +28,11 @@ def test_get_activity_timeseries_with_today_date(activity_timeseries_resource, m
     )
 
 
-def test_get_activity_timeseries_different_periods(activity_timeseries_resource, mock_response):
+def test_get_activity_timeseries_different_periods(
+    activity_timeseries_resource, mock_response_factory
+):
     """Test getting time series with different period values"""
-    mock_response.json.return_value = {"activities-steps": []}
+    mock_response = mock_response_factory(200, {"activities-steps": []})
     activity_timeseries_resource.oauth.request.return_value = mock_response
     periods = [
         Period.ONE_DAY,

tests/fitbit_client/resources/friends/test_get_friends_leaderboard.py

@@ -3,26 +3,28 @@
 """Tests for the get_friends_leaderboard endpoint."""
 
 
-def test_get_friends_leaderboard(friends_resource, mock_oauth_session, mock_response):
+def test_get_friends_leaderboard(friends_resource, mock_oauth_session, mock_response_factory):
     """Test getting friends leaderboard"""
-    mock_response.json.return_value = {
-        "data": [
-            {
-                "type": "ranked-user",
-                "id": "ABC123",
-                "attributes": {"step-rank": 1, "step-summary": 50000},
-            }
-        ],
-        "included": [
-            {
-                "avatar": "http://example.com/avatar.jpg",
-                "child": False,
-                "friend": True,
-                "name": "Test User",
-            }
-        ],
-    }
-    mock_response.headers = {"content-type": "application/json"}
+    mock_response = mock_response_factory(
+        200,
+        {
+            "data": [
+                {
+                    "type": "ranked-user",
+                    "id": "ABC123",
+                    "attributes": {"step-rank": 1, "step-summary": 50000},
+                }
+            ],
+            "included": [
+                {
+                    "avatar": "http://example.com/avatar.jpg",
+                    "child": False,
+                    "friend": True,
+                    "name": "Test User",
+                }
+            ],
+        },
+    )
     mock_oauth_session.request.return_value = mock_response
     result = friends_resource.get_friends_leaderboard()
     assert "data" in result

tests/fitbit_client/resources/nutrition/test_delete_meal.py

@@ -3,9 +3,9 @@
 """Tests for the delete_meal endpoint."""
 
 
-def test_delete_meal_success(nutrition_resource, mock_response):
+def test_delete_meal_success(nutrition_resource, mock_response_factory):
     """Test successful deletion of a meal"""
-    mock_response.status_code = 204
+    mock_response = mock_response_factory(204)
     nutrition_resource.oauth.request.return_value = mock_response
     result = nutrition_resource.delete_meal(meal_id=12345)
     assert result is None

tests/fitbit_client/resources/nutrition/test_get_food.py

@@ -3,11 +3,19 @@
 """Tests for the get_food endpoint."""
 
 
-def test_get_food_success(nutrition_resource, mock_response):
+def test_get_food_success(nutrition_resource, mock_response_factory):
     """Test successful retrieval of food details"""
-    mock_response.json.return_value = {
-        "food": {"foodId": 12345, "name": "Test Food", "calories": 100, "defaultServingSize": 100.0}
-    }
+    mock_response = mock_response_factory(
+        200,
+        {
+            "food": {
+                "foodId": 12345,
+                "name": "Test Food",
+                "calories": 100,
+                "defaultServingSize": 100.0,
+            }
+        },
+    )
     nutrition_resource.oauth.request.return_value = mock_response
     result = nutrition_resource.get_food(food_id=12345)
     assert result == mock_response.json.return_value

tests/fitbit_client/resources/nutrition/test_get_food_goals.py

@@ -3,12 +3,11 @@
 """Tests for the get_food_goals endpoint."""
 
 
-def test_get_food_goals_success(nutrition_resource, mock_response):
+def test_get_food_goals_success(nutrition_resource, mock_response_factory):
     """Test successful retrieval of food goals"""
-    mock_response.json.return_value = {
-        "goals": {"calories": 2000},
-        "foodPlan": {"intensity": "MAINTENANCE"},
-    }
+    mock_response = mock_response_factory(
+        200, {"goals": {"calories": 2000}, "foodPlan": {"intensity": "MAINTENANCE"}}
+    )
     nutrition_resource.oauth.request.return_value = mock_response
     result = nutrition_resource.get_food_goals()
     assert result == mock_response.json.return_value