fixing tests

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

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)

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,