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

Timestamp:

Feb 11, 2019, 6:55:55 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

02aee97

Parents:

93bbb89

Message:

(#52) - screenshots of the workouts maps were corrupted randomly.

Replaced our screenshot_map shell script that was calling chrome headless
directly with some python code running splinter + selenium webdriver.

Using chromedriver in such environment we can first visit the map site
for the given workout, then wait a bit for it to completely load, then
take the screenshot.

I've also removed all traces of screenshot_map from the code.

File:

• ow/tests/models/test_workout.py (modified) (5 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
@@ -576 +577 @@
     def test_map_screenshot_no_gpx(self, sms, os, root):
         workout = root['john']['1']
-        assert workout.map_screenshot is None
+        request = DummyRequest()
+        assert workout.map_screenshot(request) is None
         assert not os.path.abspath.called
         assert not os.path.dirname.called
@@ -602 +604 @@
 
         uid = str(root['john'].uid)
-        assert workout.map_screenshot == 'ow:/static/maps/' + uid + '/1.png'
+        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 == 2
+        assert os.path.join.call_count == 3
         assert os.path.exists.called
-        sms.assert_called_once_with(workout)
+        sms.assert_called_once_with(workout, request)
 
     @patch('ow.models.workout.os')
@@ -619 +627 @@
         os.path.join.side_effect = join
         # This forces the "save screenshot" code NOT to be run
-        os.path.exists.return_value = True
+        os.path.eisxts.return_value = True
 
         workout = root['john']['1']
@@ -626 +634 @@
 
         uid = str(root['john'].uid)
-        assert workout.map_screenshot == 'ow:/static/maps/' + uid + '/1.png'
+        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 == 2
+        assert os.path.join.call_count == 3
         assert os.path.exists.called
         assert not sms.called