Changeset 55470f9 in OpenWorkouts-current for ow/tests/views/test_user.py

Timestamp:

Feb 8, 2019, 1:41:41 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

6edc367, 78af3d1

Parents:

c9991fed

Message:

Fixed some tests broken during the last code changes.
Fixed a bug in the calculations of the totals for the profile page
(we weren't taking in account possible None values for distance,
duration and specially elevation/uphill)

File:

• ow/tests/views/test_user.py (modified) (2 diffs)

ow/tests/views/test_user.py

@@ -1 +1 @@
 import os
 import json
+from decimal import Decimal
 from datetime import datetime, timedelta, timezone
 from shutil import copyfileobj
@@ -269 +270 @@
         # profile page for the current day (no workouts avalable)
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 3
+        assert len(response.keys()) == 4
         current_month = datetime.now(timezone.utc).strftime('%Y-%m')
         assert response['current_month'] == current_month
         assert response['current_week'] is None
         assert response['workouts'] == []
+        assert response['totals'] == {
+            'distance': Decimal(0),
+            'time': timedelta(0),
+            'elevation': Decimal(0)
+        }
         # profile page for a previous date, that has workouts
         request.GET['year'] = 2015
-        request.GET['month'] = 8
+        request.GET['month'] = 6
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 3
-        assert response['current_month'] == '2015-08'
+        assert len(response.keys()) == 4
+        assert response['current_month'] == '2015-06'
         assert response['current_week'] is None
-        assert response['workouts'] == john.workouts(2015, 8)
+        workouts = john.workouts(2015, 6)
+        assert response['workouts'] == workouts
+        assert response['totals'] == {
+            'distance': workouts[0].distance,
+            'time': workouts[0].duration,
+            'elevation': Decimal(0)
+        }
         # same, passing a week, first on a week without workouts
         request.GET['year'] = 2015
-        request.GET['month'] = 8
+        request.GET['month'] = 6
         request.GET['week'] = 25
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 3
-        assert response['current_month'] == '2015-08'
-        assert response['current_week'] is 25
+        assert len(response.keys()) == 4
+        assert response['current_month'] == '2015-06'
+        assert response['current_week'] == 25
         assert response['workouts'] == []
-        # now in a week with workoutss
+        assert response['totals'] == {
+            'distance': Decimal(0),
+            'time': timedelta(0),
+            'elevation': Decimal(0)
+        }
+        # now in a week with workouts
         request.GET['year'] = 2015
-        request.GET['month'] = 8
+        request.GET['month'] = 6
         request.GET['week'] = 26
         response = user_views.profile(john, request)
-        assert len(response.keys()) == 3
-        assert response['current_month'] == '2015-08'
-        assert response['current_week'] is 26
-        assert response['workouts'] == john.workouts(2015, 8)
+        assert len(response.keys()) == 4
+        assert response['current_month'] == '2015-06'
+        assert response['current_week'] == 26
+        workouts = john.workouts(2015, 6)
+        assert response['workouts'] == workouts
+        assert response['totals'] == {
+            'distance': workouts[0].distance,
+            'time': workouts[0].duration,
+            'elevation': Decimal(0)
+        }
 
     def test_login_get(self, dummy_request):