From a9da920ffa389050608130f772bf4467544251a1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 16 May 2021 16:07:24 +0200 Subject: [PATCH] fixing tests --- rowers/garmin_stuff.py | 4 ++-- rowers/tests/test_plans.py | 4 +++- rowers/tests/test_user.py | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rowers/garmin_stuff.py b/rowers/garmin_stuff.py index 9b5bf773..2943a26a 100644 --- a/rowers/garmin_stuff.py +++ b/rowers/garmin_stuff.py @@ -278,7 +278,7 @@ def step_to_garmin(step,order=0): except KeyError: targetValueHigh = None - if targetType.lower() == "power": + if targetType is not None and targetType.lower() == "power": targetType = 'POWER' if targetValue is not None and targetValue > 1000: targetValue -= 1000 @@ -288,7 +288,7 @@ def step_to_garmin(step,order=0): targetValueLow -= 1000 # temp - throw away target other than power - if targetType.lower() != 'power': + if targetType is not None and targetType.lower() != 'power': targetType = None targetValue = None targetValueLow = None diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py index ecb90802..c9085517 100644 --- a/rowers/tests/test_plans.py +++ b/rowers/tests/test_plans.py @@ -13,6 +13,8 @@ from rowers import garmin_stuff import rowers.plannedsessions as plannedsessions from django.db import transaction +import json + from rowers.views.workoutviews import plannedsession_compare_view from rowers.views.otherviews import download_fit from rowers.opaque import encoder @@ -1899,7 +1901,7 @@ description: "" self.assertEqual(len(stepsdict),2) response = garmin_stuff.ps_to_garmin(self.ps_trimp,self.r) - self.assertEqual(response.status_code,200) + self.assertEqual(len(json.dumps(response)),861) url = '0' request = self.factory.get(url) diff --git a/rowers/tests/test_user.py b/rowers/tests/test_user.py index 47ed565b..cf604395 100644 --- a/rowers/tests/test_user.py +++ b/rowers/tests/test_user.py @@ -143,6 +143,7 @@ class UserPreferencesTest(TestCase): form_data = { 'stravaexportas':'Rowing', + 'garminactivity': 'RUNNING', 'polar_auto_import':True, 'c2_auto_export':False, 'c2_auto_import':False,