c2 stuff now using timezone info

rowers/tests/mocks.py

@@ -713,6 +713,9 @@ def mocked_requests(*args, **kwargs):
     with open('rowers/tests/testdata/c2jsonworkoutdata.txt','r') as infile:
         c2workoutdata = json.load(infile)
 
+    with open('rowers/tests/testdata/c2_timezone.json','r') as infile:
+        c2timezoneworkoutdata = json.load(infile)
+
     with open('rowers/tests/testdata/c2jsonstrokedata.txt','r') as infile:
         c2strokedata = json.load(infile)
 
@@ -1181,7 +1184,10 @@ def mocked_requests(*args, **kwargs):
         if c2strokestester.match(args[0]):
             return MockResponse(c2strokedata,200)
         elif c2importtester.match(args[0]):
-            return MockResponse(c2workoutdata,200)
+            if '12' in args[0]:
+                return MockResponse(c2workoutdata,200)
+            else:
+                return MockResponse(c2timezoneworkoutdata,200)
         elif c2workoutlisttester.match(args[0]):
             return MockResponse(c2workoutlist,200)
         elif 'access_token' in args[0]:

rowers/tests/test_imports.py

@@ -261,6 +261,21 @@ class C2Objects(DjangoTestCase):
 
         self.assertEqual(response.status_code, 200)
 
+    @patch('rowers.c2stuff.requests.get', side_effect=mocked_requests)
+    @patch('rowers.dataprep.create_engine')
+    def test_c2_import_tz(self, mock_get, mocked_sqlalchemy):
+
+        response = self.c.get('/rowers/workout/c2import/22/',follow=True)
+
+        self.assertRedirects(response,
+                             expected_url='/rowers/workout/'+encoded2+'/edit/',
+                             status_code=302,target_status_code=200)
+
+        self.assertEqual(response.status_code, 200)
+
+        w = Workout.objects.get(id=2)
+        self.assertEqual(w.timezone,'Europe/Prague')
+
 
     @patch('rowers.dataprep.create_engine')
     def test_strokedata(self, mocked_sqlalchemy):