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

Merge branch 'develop' into feature/opaqueid

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-09 15:46:47 +01:00
parent 6c20c3ab7f a7af332db6
commit ebb90e5997
74 changed files with 8245 additions and 1410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

263
rowers/tests/test_urls.py
View File

@@ -56,9 +56,9 @@ class URLTests(TestCase):
'sander@ds.ds',
'koeinsloot',
)
r = Rower.objects.create(user=u,rowerplan='coach')
r = Rower.objects.create(user=u,rowerplan='coach',gdproptin=True,
gdproptindate=timezone.now())
self.c = Client()
self.c.login(username='john',password='koeinsloot')
self.nu = datetime.datetime.now()
filename = 'rowers/tests/testdata/testdata.csv'
@@ -101,100 +101,100 @@ class URLTests(TestCase):
'/rowers/500/',
'/rowers/502/',
'/rowers/1/list-workouts/',
'/rowers/1/list-workouts/2016-01-01/2016-12-31',
'/rowers/1/list-workouts/2016-01-01/2016-12-31/',
'/rowers/1/ote-bests/',
'/rowers/1/ote-bests2/2016-01-01/2016-12-31',
'/rowers/about',
'/rowers/addmanual/',
'/rowers/agegroupcp/30',
'/rowers/agegroupcp/30/1',
'/rowers/agegrouprecords/male/hwt',
'/rowers/agegrouprecords/male/hwt/2000m',
'/rowers/agegrouprecords/male/hwt/2000min',
'/rowers/ajax_agegroup/45/hwt/male/1',
'/rowers/1/ote-bests2/2016-01-01/2016-12-31/',
'/rowers/about/',
'/rowers/workout/addmanual/',
'/rowers/agegroupcp/30/',
'/rowers/agegroupcp/30/1/',
'/rowers/agegrouprecords/male/hwt/',
'/rowers/agegrouprecords/male/hwt/2000m/',
'/rowers/agegrouprecords/male/hwt/2000min/',
'/rowers/ajax_agegroup/45/hwt/male/1/',
'/rowers/analysis/',
'/rowers/analysis/user/1',
'/rowers/brochure',
'/rowers/courses/upload',
'/rowers/analysis/user/1/',
'/rowers/brochure/',
'/rowers/courses/upload/',
'/rowers/createplan/',
'/rowers/createplan/user/1/',
'/rowers/cumstats/',
'/rowers/cumstats/2016-01-01/2016-12-31',
'/rowers/cumstats/user/1',
'/rowers/cumstats/user/1/2016-01-01/2016-12-31',
'/rowers/developers',
'/rowers/cumstats/2016-01-01/2016-12-31/',
'/rowers/cumstats/user/1/',
'/rowers/cumstats/user/1/2016-01-01/2016-12-31/',
'/rowers/developers/',
'/rowers/email/',
'/rowers/email/thankyou/',
'/rowers/fitness-progress/',
'/rowers/fitness-progress/user/1',
'/rowers/fitness-progress/user/1/rower',
'/rowers/fitness-progress/user/1/',
'/rowers/fitness-progress/user/1/rower/',
'/rowers/flexall/',
'/rowers/flexall/spm/hr/None/',
'/rowers/flexall/spm/hr/None/2016-01-01/2016-12-31/',
'/rowers/flexall/spm/hr/None/2016-01-01/2016-12-31/user/1',
'/rowers/flexall/spm/hr/None/2016-01-01/2016-12-31/user/1/',
'/rowers/flexall/user/1/',
'/rowers/flexalldata/',
'/rowers/help',
'/rowers/help/',
'/rowers/histo/',
'/rowers/histo/user/1',
'/rowers/histo/user/1/2016-01-01/2016-12-31',
'/rowers/histodata',
'/rowers/job-kill/1',
'/rowers/histo/user/1/',
'/rowers/histo/user/1/2016-01-01/2016-12-31/',
'/rowers/histodata/',
'/rowers/job-kill/1/',
'/rowers/jobs-status/',
'/rowers/laboratory/',
'/rowers/laboratory/user/1',
'/rowers/legal',
'/rowers/laboratory/user/1/',
'/rowers/legal/',
'/rowers/list-courses/',
'/rowers/list-graphs/',
'/rowers/list-jobs/',
'/rowers/list-workouts/',
'/rowers/list-workouts/2016-01-01/2016-12-31',
'/rowers/list-workouts/2016-01-01/2016-12-31/',
'/rowers/list-workouts/2016-01-01/2016-12-31/user/1/',
'/rowers/list-workouts/ranking',
'/rowers/list-workouts/ranking/',
'/rowers/list-workouts/user/1/',
'/rowers/me/calcdps/',
'/rowers/me/edit/',
'/rowers/me/edit/user/1',
'/rowers/me/edit/user/1/',
'/rowers/me/exportsettings/',
'/rowers/me/exportsettings/user/1',
'/rowers/me/exportsettings/user/1/',
'/rowers/me/favoritecharts/',
'/rowers/me/favoritecharts/user/1',
'/rowers/me/favoritecharts/user/1/',
'/rowers/me/invitation/',
'/rowers/me/preferences/',
'/rowers/me/preferences/user/1',
'/rowers/me/preferences/user/1/',
'/rowers/me/request/',
'/rowers/me/teams/',
'/rowers/me/workflowconfig2/',
'/rowers/me/workflowconfig2/user/1',
'/rowers/me/workflowdefault',
'/rowers/multi-compare',
'/rowers/me/workflowconfig2/user/1/',
'/rowers/me/workflowdefault/',
# '/rowers/multi-compare/',
'/rowers/ote-bests/',
'/rowers/ote-bests/2016-01-01/2016-12-31',
'/rowers/ote-bests/user/1',
'/rowers/ote-bests/user/1/2016-01-01/2016-12-31',
'/rowers/ote-bests/2016-01-01/2016-12-31/',
'/rowers/ote-bests/user/1/',
'/rowers/ote-bests/user/1/2016-01-01/2016-12-31/',
'/rowers/ote-bests2/',
'/rowers/ote-bests2/2016-01-01/2016-12-31',
'/rowers/ote-bests2/user/1',
'/rowers/ote-bests2/2016-01-01/2016-12-31/',
'/rowers/ote-bests2/user/1/',
'/rowers/ote-ranking/',
'/rowers/ote-ranking/2016-01-01/2016-12-31',
'/rowers/ote-ranking/2016-01-01/2016-12-31/',
'/rowers/ote-ranking/user/1/',
'/rowers/ote-ranking/user/1/2016-01-01/2016-12-31',
'/rowers/ote-ranking/user/1/2016-01-01/2016-12-31/',
'/rowers/otw-bests/',
'/rowers/otw-bests/2016-01-01/2016-12-31',
'/rowers/otw-bests/user/1/2016-01-01/2016-12-31',
'/rowers/partners',
'/rowers/physics',
'/rowers/planrequired',
'/rowers/promembership',
'/rowers/register',
'/rowers/otw-bests/2016-01-01/2016-12-31/',
'/rowers/otw-bests/user/1/2016-01-01/2016-12-31/',
'/rowers/partners/',
'/rowers/physics/',
'/rowers/planrequired/',
'/rowers/promembership/',
'/rowers/register/',
'/rowers/register/thankyou/',
'/rowers/sessions/',
'/rowers/sessions/2016-01-01/2016-12-31',
'/rowers/sessions/2016-01-01/2016-12-31/user/1',
'/rowers/sessions/2016-01-01/2016-12-31/',
'/rowers/sessions/2016-01-01/2016-12-31/user/1/',
'/rowers/sessions/coach/',
'/rowers/sessions/coach/user/1/',
'/rowers/sessions/create/',
'/rowers/sessions/create/user/1',
'/rowers/sessions/create/user/1/',
'/rowers/sessions/manage/',
'/rowers/sessions/manage/user/1/',
'/rowers/sessions/multiclone/',
@@ -202,83 +202,82 @@ class URLTests(TestCase):
'/rowers/sessions/multicreate/',
'/rowers/sessions/multicreate/user/1/',
'/rowers/sessions/print/',
'/rowers/sessions/print/user/1',
'/rowers/sessions/print/user/1/',
'/rowers/sessions/teamcreate/',
'/rowers/sessions/user/1',
'/rowers/sessions/user/1/',
'/rowers/team-compare-select/',
'/rowers/team-compare-select/workout/1',
'/rowers/team-compare-select/2016-01-01/2016-12-31',
'/rowers/test-job/2',
'/rowers/test-job2/2',
'/rowers/test_callback',
'/rowers/updatefitness',
'/rowers/updatefitness/rower',
'/rowers/updatefitness/rower/50',
'/rowers/user-boxplot',
'/rowers/user-boxplot-data',
'/rowers/user-boxplot-select/',
'/rowers/user-boxplot-select/user/1/',
'/rowers/user-boxplot/user/1',
'/rowers/user-multiflex-data',
'/rowers/user-multiflex-select/',
'/rowers/user-multiflex-select/2016-01-01/2016-12-31',
'/rowers/user-multiflex-select/user/1/',
'/rowers/user-multiflex-select/user/1/2016-01-01/2016-12-31',
'/rowers/user-multiflex/',
'/rowers/user-multiflex/user/1',
'/rowers/workout/'+encoded1+'/',
'/rowers/workout/'+encoded1+'/adddistanceplot',
'/rowers/workout/'+encoded1+'/adddistanceplot2',
'/rowers/workout/'+encoded1+'/addotwpowerplot',
'/rowers/workout/'+encoded1+'/addpiechart',
'/rowers/workout/'+encoded1+'/addpowerpiechart',
'/rowers/workout/'+encoded1+'/addstatic',
'/rowers/workout/'+encoded1+'/addstatic/3',
'/rowers/workout/'+encoded1+'/addtimeplot',
'/rowers/workout/'+encoded1+'/addtimeplot2',
'/rowers/workout/'+encoded1+'/comment',
'/rowers/workout/'+encoded1+'/darkskywind',
'/rowers/workout/'+encoded1+'/data',
'/rowers/workout/'+encoded1+'/edit',
'/rowers/workout/'+encoded1+'/editintervals',
'/rowers/workout/'+encoded1+'/flexchart',
'/rowers/workout/'+encoded1+'/flexchart/spm/hr/None',
'/rowers/workout/'+encoded1+'/flexchart/spm/hr/None/scatter',
'/rowers/workout/'+encoded1+'/flexchart/spm/hr/None/scatter/',
'/rowers/workout/'+encoded1+'/forcecurve',
'/rowers/workout/'+encoded1+'/get-testscript',
'/rowers/workout/'+encoded1+'/get-thumbnails',
'/rowers/workout/'+encoded1+'/histo',
'/rowers/workout/'+encoded1+'/image',
'/rowers/workout/'+encoded1+'/instroke',
'/rowers/workout/'+encoded1+'/interactiveotwplot',
'/rowers/workout/'+encoded1+'/map',
'/rowers/workout/'+encoded1+'/otwsetpower',
'/rowers/workout/'+encoded1+'/recalcsummary/',
'/rowers/workout/'+encoded1+'/restore',
'/rowers/workout/'+encoded1+'/smoothenpace',
'/rowers/workout/'+encoded1+'/split',
'/rowers/workout/'+encoded1+'/stats',
'/rowers/workout/'+encoded1+'/stream',
'/rowers/workout/'+encoded1+'/task',
'/rowers/workout/'+encoded1+'/test_strokedata',
'/rowers/workout/'+encoded1+'/toggle-ranking',
'/rowers/workout/'+encoded1+'/undosmoothenpace',
'/rowers/workout/'+encoded1+'/unsubscribe',
'/rowers/workout/'+encoded1+'/updatecp',
'/rowers/workout/'+encoded1+'/view',
'/rowers/workout/'+encoded1+'/wind',
'/rowers/workout/'+encoded1+'/workflow',
'/rowers/workout/compare/'+encoded1+'/2016-01-01/2016-12-31',
'/rowers/workout/fusion/'+encoded1+'/',
'/rowers/workout/fusion/'+encoded1+'/2016-01-01/2016-12-31',
'/rowers/team-compare-select/workout/1/',
'/rowers/team-compare-select/2016-01-01/2016-12-31/',
'/rowers/test-job/2/',
'/rowers/test-job2/2/',
# '/rowers/test_callback/',
# '/rowers/updatefitness/',
# '/rowers/updatefitness/rower/',
# '/rowers/updatefitness/rower/50/',
# '/rowers/user-boxplot/',
# '/rowers/user-boxplot-data/',
# '/rowers/user-boxplot-select//',
# '/rowers/user-boxplot-select/user/1//',
# '/rowers/user-boxplot/user/1/',
# '/rowers/user-multiflex-data/',
# '/rowers/user-multiflex-select//',
# '/rowers/user-multiflex-select/2016-01-01/2016-12-31/',
# '/rowers/user-multiflex-select/user/1//',
# '/rowers/user-multiflex-select/user/1/2016-01-01/2016-12-31/',
# '/rowers/user-multiflex//',
# '/rowers/user-multiflex/user/1/',
'/rowers/workout/'+encoded1+'//',
'/rowers/workout/'+encoded1+'/adddistanceplot/',
'/rowers/workout/'+encoded1+'/adddistanceplot2/',
'/rowers/workout/'+encoded1+'/addotwpowerplot/',
'/rowers/workout/'+encoded1+'/addpiechart/',
'/rowers/workout/'+encoded1+'/addpowerpiechart/',
'/rowers/workout/'+encoded1+'/addstatic/',
'/rowers/workout/'+encoded1+'/addstatic/3/',
'/rowers/workout/'+encoded1+'/addtimeplot/',
'/rowers/workout/'+encoded1+'/addtimeplot2/',
'/rowers/workout/'+encoded1+'/comment/',
'/rowers/workout/'+encoded1+'/darkskywind/',
'/rowers/workout/'+encoded1+'/data/',
'/rowers/workout/'+encoded1+'/edit/',
'/rowers/workout/'+encoded1+'/editintervals/',
'/rowers/workout/'+encoded1+'/flexchart/',
'/rowers/workout/'+encoded1+'/forcecurve/',
'/rowers/workout/'+encoded1+'/get-testscript/',
'/rowers/workout/'+encoded1+'/get-thumbnails/',
'/rowers/workout/'+encoded1+'/histo/',
'/rowers/workout/'+encoded1+'/image/',
'/rowers/workout/'+encoded1+'/instroke/',
'/rowers/workout/'+encoded1+'/interactiveotwplot/',
'/rowers/workout/'+encoded1+'/map/',
'/rowers/workout/'+encoded1+'/otwsetpower/',
'/rowers/workout/'+encoded1+'/recalcsummary//',
'/rowers/workout/'+encoded1+'/restore/',
'/rowers/workout/'+encoded1+'/smoothenpace/',
'/rowers/workout/'+encoded1+'/split/',
'/rowers/workout/'+encoded1+'/stats/',
'/rowers/workout/'+encoded1+'/stream/',
'/rowers/workout/'+encoded1+'/task/',
'/rowers/workout/'+encoded1+'/test_strokedata/',
'/rowers/workout/'+encoded1+'/toggle-ranking/',
'/rowers/workout/'+encoded1+'/undosmoothenpace/',
'/rowers/workout/'+encoded1+'/unsubscribe/',
'/rowers/workout/'+encoded1+'/updatecp/',
'/rowers/workout/'+encoded1+'/view/',
'/rowers/workout/'+encoded1+'/wind/',
'/rowers/workout/'+encoded1+'/workflow/',
'/rowers/workout/compare/'+encoded1+'/2016-01-01/2016-12-31/',
'/rowers/workout/fusion/'+encoded1+'//',
'/rowers/workout/fusion/'+encoded1+'/2016-01-01/2016-12-31/',
'/rowers/workout/upload/',
'/rowers/workout/upload/team/',
'/rowers/workouts-join',
'/rowers/workouts-join/',
'/rowers/workouts-join-select/',
'/rowers/workouts-join-select/2016-01-01/2016-12-31',
'/rowers/workouts-join-select/2016-01-01/2016-12-31/',
]
# urlstotest = ['/rowers/createplan/user/1/']
lijst = []
for url in urlstotest:
lijst.append(
@@ -286,12 +285,20 @@ class URLTests(TestCase):
)
@parameterized.expand(lijst)
def test_url_generator(self,url,expected):
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.read_df_sql')
@patch('rowers.dataprep.getsmallrowdata_db')
def test_url_generator(self,url,expected,
mocked_sqlalchemy,
mocked_read_df_sql,
mocked_getsmallrowdata_db):
login = self.c.login(username='john',password='koeinsloot')
self.assertTrue(login)
response = self.c.get(url,follow=True)
if response.status_code != expected:
print url
print response.status_code
self.assertEqual(response.status_code,
expected,
msg=url+' response status code not 200')
expected)