From e1aea906516e7be4a8f9ec00f0c6175da9c24f91 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 13 Feb 2019 22:22:13 +0100 Subject: [PATCH] passing all tests --- rowers/templates/summary_edit.html | 2 +- rowers/templates/team.html | 2 +- rowers/tests/test_urls.py | 10 +++++----- rowers/tests/testdata/testdata.csv.gz | Bin 12525 -> 12525 bytes rowers/views/workoutviews.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rowers/templates/summary_edit.html b/rowers/templates/summary_edit.html index 58caafad..39dccc10 100644 --- a/rowers/templates/summary_edit.html +++ b/rowers/templates/summary_edit.html @@ -84,7 +84,7 @@ {{ field.as_hidden }} {% endfor %}

- +

Reset to last saved diff --git a/rowers/templates/team.html b/rowers/templates/team.html index 630a7458..3f31596f 100644 --- a/rowers/templates/team.html +++ b/rowers/templates/team.html @@ -64,7 +64,7 @@ {{ inviteform.as_table }} {% csrf_token %} - + {% else %}

diff --git a/rowers/tests/test_urls.py b/rowers/tests/test_urls.py index e01e4d69..988baa68 100644 --- a/rowers/tests/test_urls.py +++ b/rowers/tests/test_urls.py @@ -271,21 +271,21 @@ class URLTests(TestCase): 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: if u not in tested and 'rowers' in u and 'http' not in u and 'authorize' not in u and 'import' not in u and 'logout' not in u: - response = self.c.get(u) - if response.status_code not in [200,302]: + response2 = self.c.get(u) + if response2.status_code not in [200,302]: print(len(tested)) + print(response.templates[0].name) print(url) print(u) print(response.status_code) tested.append(u) - self.assertIn(response.status_code, + self.assertIn(response2.status_code, [200,302]) else: tested.append(u) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index b836d629b5998ddb5a7beb3cbec1f184b7088d51..109abfa4957398ccfb83af526ab01ad32de22798 100644 GIT binary patch delta 15 WcmaEx_%@MEzMF$Xt7{|Ma{~Y~Dh1yF delta 15 WcmaEx_%@MEzMF$%Qo}~J=LP^ZXa+q1 diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index f97de731..acbee20d 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -4706,7 +4706,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" 'name':'Workouts' }, { - 'url':get_workout_default_page(request,row.id), + 'url':get_workout_default_page(request,encoder.encode_hex(row.id)), 'name': row.name }, {