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

passes tests now - for what it's worth

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-03 21:54:34 +01:00
parent f901258b9b
commit 6c20c3ab7f
5 changed files with 165 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
rowers/tests/test_imports.py
View File

@@ -32,6 +32,9 @@ from mock import Mock, patch
from minimocktest import MockTestCase
import pandas as pd
import rowers.c2stuff as c2stuff
from rowers.opaque import encoder
encoded1 = str(encoder.encode_hex(1))
encoded2 = str(encoder.encode_hex(2))
import json
import numpy as np
@@ -123,13 +126,13 @@ class C2Objects(DjangoTestCase):
@patch('rowers.c2stuff.requests.post', side_effect=mocked_requests)
@patch('rowers.c2stuff.requests.get', side_effect=mocked_requests)
def test_c2_upload(self, mock_get, mock_post):
response = self.c.get('/rowers/workout/1/c2uploadw/')
response = self.c.get('/rowers/workout/'+encoded1+'/c2uploadw/')
self.assertRedirects(response,
expected_url = '/rowers/workout/1/edit',
expected_url = '/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/workout/1/edit')
self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit')
self.assertEqual(response.status_code, 302)
@patch('rowers.c2stuff.requests.post', side_effect=mocked_requests)
@@ -146,7 +149,7 @@ class C2Objects(DjangoTestCase):
response = self.c.get('/rowers/workout/c2import/12/',follow=True)
self.assertRedirects(response,
expected_url='/rowers/workout/2/edit',
expected_url='/rowers/workout/'+encoded2+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -294,7 +297,7 @@ class StravaObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/stravaimport/12',follow=True)
self.assertRedirects(response,
expected_url='/rowers/workout/1/edit',
expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=301,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -375,13 +378,13 @@ class STObjects(DjangoTestCase):
@patch('rowers.sporttracksstuff.requests.post', side_effect=mocked_requests)
@patch('rowers.sporttracksstuff.requests.get', side_effect=mocked_requests)
def test_sporttracks_upload(self, mock_get, mock_post):
response = self.c.get('/rowers/workout/1/sporttracksuploadw/')
response = self.c.get('/rowers/workout/'+encoded1+'/sporttracksuploadw/')
self.assertRedirects(response,
expected_url = '/rowers/workout/1/edit',
expected_url = '/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/workout/1/edit')
self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit')
self.assertEqual(response.status_code, 302)
@patch('rowers.sporttracksstuff.requests.get', side_effect=mocked_requests)
@@ -396,7 +399,7 @@ class STObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/sporttracksimport/12/',follow=True)
self.assertRedirects(response,
expected_url='/rowers/workout/2/edit',
expected_url='/rowers/workout/'+encoded2+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -485,13 +488,13 @@ class RunKeeperObjects(DjangoTestCase):
@patch('rowers.runkeeperstuff.requests.post', side_effect=mocked_requests)
@patch('rowers.runkeeperstuff.requests.get', side_effect=mocked_requests)
def test_runkeeper_upload(self, mock_get, mock_post):
response = self.c.get('/rowers/workout/1/runkeeperuploadw/')
response = self.c.get('/rowers/workout/'+encoded1+'/runkeeperuploadw/')
self.assertRedirects(response,
expected_url = '/rowers/workout/1/edit',
expected_url = '/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/workout/1/edit')
self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit')
self.assertEqual(response.status_code, 302)
@patch('rowers.runkeeperstuff.requests.get', side_effect=mocked_requests)
@@ -506,7 +509,7 @@ class RunKeeperObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/runkeeperimport/12/',follow=True)
self.assertRedirects(response,
expected_url='/rowers/workout/2/edit',
expected_url='/rowers/workout/'+encoded2+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -587,13 +590,13 @@ class UAObjects(DjangoTestCase):
@patch('rowers.underarmourstuff.requests.post', side_effect=mocked_requests)
@patch('rowers.underarmourstuff.requests.get', side_effect=mocked_requests)
def test_underarmour_upload(self, mock_get, mock_post):
response = self.c.get('/rowers/workout/1/underarmouruploadw/')
response = self.c.get('/rowers/workout/'+encoded1+'/underarmouruploadw/')
self.assertRedirects(response,
expected_url = '/rowers/workout/1/edit',
expected_url = '/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/workout/1/edit')
self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit')
self.assertEqual(response.status_code, 302)
@patch('rowers.underarmourstuff.requests.get', side_effect=mocked_requests)
@@ -609,7 +612,7 @@ class UAObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/underarmourimport/12/',follow=True)
self.assertRedirects(response,
expected_url='/rowers/workout/2/edit',
expected_url='/rowers/workout/'+encoded2+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -689,13 +692,15 @@ class TPObjects(DjangoTestCase):
@patch('rowers.tpstuff.requests.post', side_effect=mocked_requests)
@patch('rowers.tpstuff.requests.get', side_effect=mocked_requests)
def test_tp_upload(self, mock_get, mock_post):
response = self.c.get('/rowers/workout/1/tpuploadw/')
url = '/rowers/workout/'+encoded1+'/tpuploadw/'
response = self.c.get(url)
self.assertRedirects(response,
expected_url = '/rowers/workout/1/edit',
expected_url = '/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.url, '/rowers/workout/1/edit')
self.assertEqual(response.url, '/rowers/workout/'+encoded1+'/edit')
self.assertEqual(response.status_code, 302)

95
rowers/tests/test_urls.py
View File

@@ -2,6 +2,9 @@
import pytest
pytestmark = pytest.mark.django_db
from rowers.opaque import encoder
encoded1 = str(encoder.encode_hex(1))
from bs4 import BeautifulSoup
import re
@@ -223,52 +226,52 @@ class URLTests(TestCase):
'/rowers/user-multiflex-select/user/1/2016-01-01/2016-12-31',
'/rowers/user-multiflex/',
'/rowers/user-multiflex/user/1',
'/rowers/workout/1/',
'/rowers/workout/1/adddistanceplot',
'/rowers/workout/1/adddistanceplot2',
'/rowers/workout/1/addotwpowerplot',
'/rowers/workout/1/addpiechart',
'/rowers/workout/1/addpowerpiechart',
'/rowers/workout/1/addstatic',
'/rowers/workout/1/addstatic/3',
'/rowers/workout/1/addtimeplot',
'/rowers/workout/1/addtimeplot2',
'/rowers/workout/1/comment',
'/rowers/workout/1/darkskywind',
'/rowers/workout/1/data',
'/rowers/workout/1/edit',
'/rowers/workout/1/editintervals',
'/rowers/workout/1/flexchart',
'/rowers/workout/1/flexchart/spm/hr/None',
'/rowers/workout/1/flexchart/spm/hr/None/scatter',
'/rowers/workout/1/flexchart/spm/hr/None/scatter/',
'/rowers/workout/1/forcecurve',
'/rowers/workout/1/get-testscript',
'/rowers/workout/1/get-thumbnails',
'/rowers/workout/1/histo',
'/rowers/workout/1/image',
'/rowers/workout/1/instroke',
'/rowers/workout/1/interactiveotwplot',
'/rowers/workout/1/map',
'/rowers/workout/1/otwsetpower',
'/rowers/workout/1/recalcsummary/',
'/rowers/workout/1/restore',
'/rowers/workout/1/smoothenpace',
'/rowers/workout/1/split',
'/rowers/workout/1/stats',
'/rowers/workout/1/stream',
'/rowers/workout/1/task',
'/rowers/workout/1/test_strokedata',
'/rowers/workout/1/toggle-ranking',
'/rowers/workout/1/undosmoothenpace',
'/rowers/workout/1/unsubscribe',
'/rowers/workout/1/updatecp',
'/rowers/workout/1/view',
'/rowers/workout/1/wind',
'/rowers/workout/1/workflow',
'/rowers/workout/compare/1/2016-01-01/2016-12-31',
'/rowers/workout/fusion/1/',
'/rowers/workout/fusion/1/2016-01-01/2016-12-31',
'/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/workout/upload/',
'/rowers/workout/upload/team/',
'/rowers/workouts-join',

56
rowers/tests/tests.py
View File

@@ -41,6 +41,10 @@ from rowers.views import error500_view,error404_view,error400_view,error403_view
from rowers.dataprep import delete_strokedata
from rowers.opaque import encoder
encoded1 = str(encoder.encode_hex(1))
from redis import StrictRedis
redis_connection = StrictRedis()
@@ -429,22 +433,22 @@ class ViewTest(TestCase):
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
response = self.c.get('/rowers/workout/1/', form_data, follow=True)
response = self.c.get('/rowers/workout/'+encoded1+'/', form_data, follow=True)
self.assertEqual(response.status_code, 200)
response = self.c.get('/rowers/workout/1/edit', form_data, follow=True)
response = self.c.get('/rowers/workout/'+encoded1+'/edit', form_data, follow=True)
self.assertEqual(response.status_code, 200)
response = self.c.get('/rowers/workout/1/histo', form_data, follow=True)
response = self.c.get('/rowers/workout/'+encoded1+'/histo', form_data, follow=True)
self.assertEqual(response.status_code, 200)
response = self.c.get('/rowers/workout/1/workflow',
response = self.c.get('/rowers/workout/'+encoded1+'/workflow',
follow=True)
self.assertEqual(response.status_code, 200)
@@ -465,7 +469,7 @@ class ViewTest(TestCase):
}
form = WorkoutForm(data=form_data)
self.assertTrue(form.is_valid())
response = self.c.post('/rowers/workout/1/edit', form_data, follow=True)
response = self.c.post('/rowers/workout/'+encoded1+'/edit', form_data, follow=True)
self.assertEqual(response.status_code, 200)
@@ -518,12 +522,12 @@ class ViewTest(TestCase):
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
response = self.c.get('/rowers/workout/1/', form_data, follow=True)
response = self.c.get('/rowers/workout/'+encoded1+'/', form_data, follow=True)
self.assertEqual(response.status_code, 200)
@@ -560,7 +564,7 @@ class ViewTest(TestCase):
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -629,7 +633,7 @@ class ViewTest(TestCase):
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -640,7 +644,7 @@ class ViewTest(TestCase):
form_data = {}
form = CNsummaryForm(form_data,file_data)
response = self.c.post('rowers/workout/1/crewnerdsummary',
response = self.c.post('rowers/workout/'+encoded1+'/crewnerdsummary',
form_data,
follow=True)
@@ -679,7 +683,7 @@ class ViewTest(TestCase):
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -716,7 +720,7 @@ class ViewTest(TestCase):
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -755,7 +759,7 @@ class ViewTest(TestCase):
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -791,7 +795,7 @@ class ViewTest(TestCase):
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -828,7 +832,7 @@ class ViewTest(TestCase):
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -867,7 +871,7 @@ class ViewTest(TestCase):
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
f.close()
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -903,7 +907,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -936,7 +940,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -969,7 +973,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -1002,7 +1006,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -1036,7 +1040,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -1068,7 +1072,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -1100,7 +1104,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -1132,7 +1136,7 @@ class ViewTest(TestCase):
form = DocumentsForm(form_data,file_data)
response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@@ -1169,7 +1173,7 @@ class ViewTest(TestCase):
# form_data, follow=True,
# format='multipart')
# f.close()
# self.assertRedirects(response, expected_url='/rowers/workout/1/edit',
# self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit',
# status_code=302,target_status_code=200)
# self.assertEqual(response.status_code, 200)