Private
Public Access
1
0

bug fix sporttracks no gps

This commit is contained in:
Sander Roosendaal
2019-02-04 09:30:09 +01:00
parent 0edeb971d5
commit b439d9c6ac
8 changed files with 22 additions and 21 deletions

View File

@@ -532,6 +532,7 @@ def mocked_requests(*args, **kwargs):
}
ststrokesjson = json.load(open('rowers/tests/testdata/sporttracksstrokedata.txt','r'))
ststrokesjson_nogps = json.load(open('rowers/tests/testdata/sporttracksstrokedatanolocation.txt','r'))
rkstrokesjson = json.load(open('rowers/tests/testdata/rkstrokes.txt','r'))
@@ -606,7 +607,7 @@ def mocked_requests(*args, **kwargs):
stworkoutlistregex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities$'
stworkoutlisttester = re.compile(stworkoutlistregex)
ststrokesregex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities/\d+$'
ststrokesregex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities/(\d+)$'
ststrokestester = re.compile(ststrokesregex)
rkuploadregex = '.*?api\.runkeeper\.com\/fitnessActivities$'
@@ -725,7 +726,10 @@ def mocked_requests(*args, **kwargs):
}
return MockResponse(json_data,200)
if ststrokestester.match(args[0]):
return MockResponse(ststrokesjson,200)
if ststrokestester.match(args[0]).group(1) == '13':
return MockResponse(ststrokesjson_nogps,200)
else:
return MockResponse(strokesjson,200)
if stuploadtester.match(args[0]):
json_data = {
"uris": [

View File

@@ -421,6 +421,17 @@ class STObjects(DjangoTestCase):
self.assertEqual(response.status_code, 200)
@patch('rowers.imports.requests.get', side_effect=mocked_requests)
def test_sporttracks_import(self, mock_get):
response = self.c.get('/rowers/workout/sporttracksimport/13/',follow=True)
self.assertRedirects(response,
expected_url='/rowers/workout/2/edit/',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@patch('rowers.dataprep.create_engine')
def test_strokedata(self, mocked_sqlalchemy):
with open('rowers/tests/testdata/sporttrackstestdata.txt','r') as infile:

File diff suppressed because one or more lines are too long

Binary file not shown.