sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixing c2 timezone issue when timezone is unknown

Browse Source
This commit is contained in:
Sander Roosendaal
2021-05-18 06:47:27 +02:00
parent acc4c6f305
commit bad14ed49a
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/tests/mocks.py
View File

@@ -719,6 +719,8 @@ def mocked_requests(*args, **kwargs):
with open('rowers/tests/testdata/c2_timezone2.json','r') as infile:
c2timezoneworkoutdata2 = json.load(infile)
with open('rowers/tests/testdata/c2_timezonebad.json','r') as infile:
c2timezoneworkoutdatabad = json.load(infile)
with open('rowers/tests/testdata/c2jsonstrokedata.txt','r') as infile:
c2strokedata = json.load(infile)
@@ -1192,6 +1194,8 @@ def mocked_requests(*args, **kwargs):
return MockResponse(c2workoutdata,200)
elif '31' in args[0]:
return MockResponse(c2timezoneworkoutdata2,200)
elif '32' in args[0]:
return MockResponse(c2timezoneworkoutdatabad,200)
else:
return MockResponse(c2timezoneworkoutdata,200)
elif c2workoutlisttester.match(args[0]):

16
rowers/tests/test_imports.py
View File

@@ -277,6 +277,22 @@ class C2Objects(DjangoTestCase):
w = Workout.objects.get(id=2)
self.assertEqual(w.timezone,'Europe/Prague')
@patch('rowers.c2stuff.requests.get', side_effect=mocked_requests)
@patch('rowers.dataprep.create_engine')
def test_c2_import_tz3(self, mock_get, mocked_sqlalchemy):
response = self.c.get('/rowers/workout/c2import/32/',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,'UTC')
@patch('rowers.c2stuff.requests.get', side_effect=mocked_requests)
@patch('rowers.dataprep.create_engine')
def test_c2_import_tz2(self, mock_get, mocked_sqlalchemy):