Private
Public Access
1
0

passing tests

This commit is contained in:
Sander Roosendaal
2019-11-14 15:15:25 +01:00
parent b32f5e71d1
commit ad3681723a
5 changed files with 33 additions and 13 deletions

View File

@@ -141,6 +141,16 @@ def mocked_read_df_sql(id):
return df
def mocked_get_video_data(*args, **kwargs):
with open('rowers/tests/testdata/videodata.json','r') as infile:
data = json.load(infile)
maxtime = 4135.
with open('rowers/tests/testdata/videometrics.json','r') as infile:
metrics = json.load(infile)
return data,metrics,maxtime
def mocked_getrowdata_db(*args, **kwargs):
df = pd.read_csv('rowers/tests/testdata/getrowdata_mock.csv')

View File

@@ -256,12 +256,14 @@ class URLTests(TestCase):
@patch('rowers.dataprep.getsmallrowdata_db')
@patch('requests.get',side_effect=mocked_requests)
@patch('requests.post',side_effect=mocked_requests)
@patch('rowers.dataprep.get_video_data',side_effect=mocked_get_video_data)
def test_url_generator(self,url,expected,
mocked_sqlalchemy,
mocked_read_df_sql,
mocked_getsmallrowdata_db,
mock_get,
mock_post):
mock_post,
mocked_get_video_data):
if url not in tested:
login = self.c.login(username='john',password='koeinsloot')
@@ -294,5 +296,3 @@ class URLTests(TestCase):
[200,302,301])
else:
tested.append(u)

1
rowers/tests/testdata/videodata.json vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1 @@
{"boatspeed": {"name": "Boat Speed (m/s)", "metric": "velo", "unit": ""}, "cumdist": {"name": "Cumulative Distance (m)", "metric": "cumdist", "unit": ""}, "distance": {"name": "Distance (m)", "metric": "distance", "unit": ""}, "distanceperstroke": {"name": "Distance per Stroke (m)", "metric": "distanceperstroke", "unit": ""}, "pace": {"name": "Pace (/500m)", "metric": "pace", "unit": ""}, "spm": {"name": "Stroke Rate (spm)", "metric": "spm", "unit": ""}}

View File

@@ -675,6 +675,14 @@ def workouts_join_view(request):
url = reverse('workouts_join_select')
return HttpResponseRedirect(url)
defaultoptions = {
'includereststrokes': False,
'workouttypes':['rower','dynamic','slides'],
'waterboattype': mytypes.waterboattype,
'rankingonly': False,
'function':'boxplot'
}
@user_passes_test(ispromember, login_url="/rowers/paidplans",
message="This functionality requires a Pro plan or higher",
redirect_field_name=None)