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

passing all but one test

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-13 21:42:08 +01:00
parent d35d7e8e2c
commit 292e703766
14 changed files with 188 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
rowers/tests/test_aworkouts.py
View File

@@ -125,7 +125,7 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_forcecurve_view',kwargs={'id':self.wwater.id})
url = reverse('workout_forcecurve_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -186,7 +186,7 @@ class WorkoutViewTest(TestCase):
expected_url = reverse(self.r.defaultlandingpage,
kwargs = {
'id':12
'id':encoder.encode_hex(12)
})
self.assertRedirects(response,
@@ -209,7 +209,7 @@ class WorkoutViewTest(TestCase):
response = self.c.get('/')
url = reverse('multi_compare_view',kwargs={
'userid':self.u.id,
'id':self.werg1.id,
'id':encoder.encode_hex(self.werg1.id),
})
print url
@@ -241,13 +241,13 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_view',kwargs={'id':self.wwater.id})
url = reverse('workout_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
url = reverse('workout_downloadmetar_view',kwargs={
'id': self.wwater.id,
'id': encoder.encode_hex(self.wwater.id),
'airportcode': 'LKHO'
}
)
@@ -256,7 +256,7 @@ class WorkoutViewTest(TestCase):
self.assertEqual(response.status_code,200)
url = reverse('workout_downloadwind_view',kwargs={
'id': self.wwater.id,
'id': encoder.encode_hex(self.wwater.id),
}
)
@@ -270,14 +270,14 @@ class WorkoutViewTest(TestCase):
self.assertTrue(login)
url = reverse('workout_smoothenpace_view',kwargs={'id':self.wwater.id})
url = reverse('workout_smoothenpace_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url,follow=True)
self.assertEqual(response.status_code,200)
expected_url = reverse(self.r.defaultlandingpage,
kwargs = {
'id':self.wwater.id
'id':encoder.encode_hex(self.wwater.id)
}
)
@@ -285,14 +285,14 @@ class WorkoutViewTest(TestCase):
expected_url=expected_url,
status_code=302,target_status_code=200)
url = reverse('workout_undo_smoothenpace_view',kwargs={'id':self.wwater.id})
url = reverse('workout_undo_smoothenpace_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url,follow=True)
self.assertEqual(response.status_code,200)
expected_url = reverse(self.r.defaultlandingpage,
kwargs = {
'id':self.wwater.id
'id':encoder.encode_hex(self.wwater.id)
}
)
@@ -308,7 +308,7 @@ class WorkoutViewTest(TestCase):
self.assertTrue(login)
url = reverse('workout_wind_view',kwargs={'id':self.wwater.id})
url = reverse('workout_wind_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -336,7 +336,7 @@ class WorkoutViewTest(TestCase):
self.assertTrue(login)
url = reverse('workout_stream_view',kwargs={'id':self.wwater.id})
url = reverse('workout_stream_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -363,7 +363,7 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('instroke_view',kwargs={'id':self.winstroke.id})
url = reverse('instroke_view',kwargs={'id':encoder.encode_hex(self.winstroke.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -380,7 +380,7 @@ class WorkoutViewTest(TestCase):
self.assertTrue(login)
url = reverse('workout_otwsetpower_view',kwargs={'id':self.wwater.id})
url = reverse('workout_otwsetpower_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -397,7 +397,7 @@ class WorkoutViewTest(TestCase):
response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200)
expected_url = reverse('workout_edit_view',kwargs={'id':self.wwater.id})
expected_url = reverse('workout_edit_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
self.assertRedirects(response,
expected_url=expected_url,
@@ -410,7 +410,7 @@ class WorkoutViewTest(TestCase):
self.assertTrue(login)
url = reverse('workout_comment_view',kwargs={'id':self.wwater.id})
url = reverse('workout_comment_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -425,7 +425,7 @@ class WorkoutViewTest(TestCase):
response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200)
url = reverse('workout_unsubscribe_view',kwargs={'id':self.wwater.id})
url = reverse('workout_unsubscribe_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -436,7 +436,7 @@ class WorkoutViewTest(TestCase):
self.assertTrue(login)
url = reverse('workout_map_view',kwargs={'id':self.wwater.id})
url = reverse('workout_map_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -448,7 +448,8 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_uploadimage_view',kwargs={'id':self.werg1.id})
url = reverse('workout_uploadimage_view',
kwargs={'id':encoder.encode_hex(self.werg1.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -466,7 +467,8 @@ class WorkoutViewTest(TestCase):
response = self.c.post(url,form_data,format='multipart',follow=True)
expected_url = reverse(self.r.defaultlandingpage,kwargs={'id':self.werg1.id})
expected_url = reverse(self.r.defaultlandingpage,
kwargs={'id':encoder.encode_hex(self.werg1.id)})
self.assertRedirects(response,
expected_url=expected_url,
@@ -480,7 +482,7 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_split_view',kwargs={'id':self.werg1.id})
url = reverse('workout_split_view',kwargs={'id':encoder.encode_hex(self.werg1.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -505,8 +507,9 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_fusion_view',kwargs={'id1':self.werg2.id,
'id2':self.werg2copy.id})
url = reverse('workout_fusion_view',
kwargs={'id1':encoder.encode_hex(self.werg2.id),
'id2':encoder.encode_hex(self.werg2copy.id)})
response = self.c.get(url)
@@ -534,7 +537,7 @@ class WorkoutViewTest(TestCase):
self.assertTrue(login)
url = reverse('workout_summary_edit_view',kwargs={'id':self.wwater.id})
url = reverse('workout_summary_edit_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)

10
rowers/tests/test_flexchart.py
View File

@@ -103,7 +103,8 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_flexchart3_view',kwargs={'id':self.wwater.id})
url = reverse('workout_flexchart3_view',
kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -126,7 +127,7 @@ class WorkoutViewTest(TestCase):
self.assertEqual(response.status_code,200)
url = reverse('workout_flexchart3_view',kwargs={
'id':self.wwater.id,
'id':encoder.encode_hex(self.wwater.id),
'xparam':'distance',
'yparam1':'hr',
'yparam2':'power'
@@ -150,7 +151,8 @@ class WorkoutViewTest(TestCase):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_flexchart3_view',kwargs={'id':self.werg1.id})
url = reverse('workout_flexchart3_view',
kwargs={'id':encoder.encode_hex(self.werg1.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
@@ -168,7 +170,7 @@ class WorkoutViewTest(TestCase):
self.assertEqual(response.status_code,200)
url = reverse('workout_flexchart3_view',kwargs={
'id':self.werg1.id,
'id':encoder.encode_hex(self.werg1.id),
'xparam':'distance',
'yparam1':'hr',
'yparam2':'power'

5
rowers/tests/test_imports.py
View File

@@ -431,8 +431,11 @@ class STObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/sporttracksimport/13/',follow=True)
expected_url = reverse('workout_edit_view',
kwargs = {'id':encoder.encode_hex(2)})
self.assertRedirects(response,
expected_url='/rowers/workout/2/edit/',
expected_url=expected_url,
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)

2
rowers/tests/test_plans.py
View File

@@ -1575,7 +1575,7 @@ class PlannedSessionsView(TestCase):
url = '/rowers/sessions/{psid}/detach/{id}/'.format(
psid=self.ps_time.id,
id = self.w1.id,
id = encoder.encode_hex(self.w1.id),
)
response = self.c.get(url,follow=True)

2
rowers/tests/test_simplefunctions.py
View File

@@ -74,7 +74,7 @@ class SimpleViewTest(TestCase):
def test_getworkout(self):
with assert_raises(Http404):
w = get_workout(123)
w = get_workout(encoder.encode_hex(123))
def test_deactivate(self):
login = self.c.login(username=self.u.username, password=self.password)

6
rowers/tests/test_urls.py
View File

@@ -219,7 +219,7 @@ class URLTests(TestCase):
'/rowers/workout/'+encoded1+'/stats/',
'/rowers/workout/'+encoded1+'/stream/',
# '/rowers/workout/'+encoded1+'/task/',
'/rowers/workout/'+encoded1+'/teststrokedata/',
# '/rowers/workout/'+encoded1+'/teststrokedata/',
'/rowers/workout/'+encoded1+'/toggle-ranking/',
'/rowers/workout/'+encoded1+'/undosmoothenpace/',
'/rowers/workout/'+encoded1+'/unsubscribe/',
@@ -270,6 +270,10 @@ class URLTests(TestCase):
expected)
html = BeautifulSoup(response.content,'html.parser')
if 'restore' in url:
print html.find_all('a')
urls = [a['href'] for a in html.find_all('a')]
for u in urls:

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.