Changeset b3374f6 in OpenWorkouts-current for ow/tests/models/test_workout.py

Timestamp:

Feb 12, 2019, 5:55:33 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

c999b73e

Parents:

f713dbc

Message:

(#52) - Make map screenshot generation async and non-blocker of the dashboard
and user profile pages:

• workout.map_screenshot is a property again, returns a string with the static path (suitable for use with request.static_url()) for the map screenshot file if exists, none otherwise

• added a couple of helpers to build the proper screenshot name and full path on the filesystem

• added a view to generate the map if needed, returning the full static url to the screenshot file in a json-encoded stream

• added a new js ow tool that looks for workouts that still don't have a map screenshot, calling the view to generate that screenshot and updating the map screenshot when the file is ready

• modified the dashboard and user profile templates, so a dummy/placeholder image is shown when no map screenshot is yet ready, plus setup and calls for the js tool that generates the maps.

File:

• ow/tests/models/test_workout.py (modified) (3 diffs)

ow/tests/models/test_workout.py

@@ -7 +7 @@
 import pytest
 from pyramid.security import Allow, Everyone, Deny, ALL_PERMISSIONS
-from pyramid.testing import DummyRequest
 
 from ow.models.workout import Workout
@@ -573 +572 @@
         assert workout.has_fit
 
+    def test_map_screenshot_name(self, root):
+        workout = root['john']['1']
+        assert workout.map_screenshot_name == (
+            str(root['john'].uid) + '/' + str(workout.workout_id) + '.png')
+
+    def test_map_screenshot_path(self, root):
+        workout = root['john']['1']
+        assert workout.map_screenshot_path.endswith(
+            'static/maps/' + workout.map_screenshot_name)
+
     @patch('ow.models.workout.os')
-    @patch('ow.models.workout.save_map_screenshot')
-    def test_map_screenshot_no_gpx(self, sms, os, root):
-        workout = root['john']['1']
-        request = DummyRequest()
-        assert workout.map_screenshot(request) is None
-        assert not os.path.abspath.called
-        assert not os.path.dirname.called
+    def test_map_screenshot_no_gpx(self, os, root):
+        workout = root['john']['1']
+        assert workout.map_screenshot is None
         assert not os.path.join.called
         assert not os.path.exists.called
-        assert not sms.called
 
     @patch('ow.models.workout.os')
-    @patch('ow.models.workout.save_map_screenshot')
-    def test_map_screenshot_save(self, sms, os, root):
-        """
-        A workout with a tracking file has no map screenshot, one is
-        saved to the filesystem.
-        This test simply asserts the calls to the separate methods that
-        look for existing screenshots and save a new one
-        """
-        os.path.abspath.return_value = 'current_dir'
-        os.path.join.side_effect = join
-        # This forces the "save screenshot" code to be run
+    def test_map_screenshot_no_shot(self, os, root):
+        """
+        A workout with a tracking file has no map screenshot
+        """
+        # This says "no screenshot found"
         os.path.exists.return_value = False
 
@@ -603 +601 @@
         workout.tracking_filetype = 'gpx'
 
-        uid = str(root['john'].uid)
-        request = DummyRequest()
-        # dummyrequest can't resolve static assets without adding a lot
-        # of boilerplate, no need for that here
-        request.static_url = Mock()
-        request.static_url.return_value = 'ow:/static/maps/' + uid + '/1.png'
-        res = workout.map_screenshot(request)
-        assert res == 'ow:/static/maps/' + uid + '/1.png'
-        assert os.path.abspath.called
-        assert os.path.dirname.called
-        assert os.path.join.call_count == 3
-        assert os.path.exists.called
-        sms.assert_called_once_with(workout, request)
+        assert workout.map_screenshot is None
+        assert os.path.join.called
+        os.path.exists.assert_called_once_with(workout.map_screenshot_path)
 
     @patch('ow.models.workout.os')
-    @patch('ow.models.workout.save_map_screenshot')
-    def test_map_screenshot_do_not_save(self, sms, os, root):
+    def test_map_screenshot_has_shot(self, os, root):
         """
         A workout with a tracking file has a map screenshot, the path to that
         is returned without doing anything else
         """
-        os.path.abspath.return_value = 'current_dir'
+        # This says "yeah, we have a screenshot"
+        os.path.exists.return_value = True
+        os.path.abspath.return_value = '/'
         os.path.join.side_effect = join
-        # This forces the "save screenshot" code NOT to be run
-        os.path.eisxts.return_value = True
 
         workout = root['john']['1']
         workout.tracking_file = 'faked gpx file'
         workout.tracking_filetype = 'gpx'
-
         uid = str(root['john'].uid)
-        request = DummyRequest()
-        # dummyrequest can't resolve static assets without adding a lot
-        # of boilerplate, no need for that here
-        request.static_url = Mock()
-        request.static_url.return_value = 'ow:/static/maps/' + uid + '/1.png'
-        res = workout.map_screenshot(request)
-        assert res == 'ow:/static/maps/' + uid + '/1.png'
-        assert os.path.abspath.called
-        assert os.path.dirname.called
-        assert os.path.join.call_count == 3
-        assert os.path.exists.called
-        assert not sms.called
+        assert workout.map_screenshot == 'ow:/static/maps/' + uid + '/1.png'
+        os.path.exists.assert_called_once_with(workout.map_screenshot_path)
+        assert os.path.join.called