From 9f8869f0a0d41d01c169175b7e0ea1e783e96744 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 4 Dec 2016 13:44:39 +0100 Subject: [PATCH] Added workout form test + fixed strokedata update bug --- rowers/tests.py | 19 +++++++++++++++++-- rowers/views.py | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/rowers/tests.py b/rowers/tests.py index 2ee797c7..8a5a4b7d 100644 --- a/rowers/tests.py +++ b/rowers/tests.py @@ -434,9 +434,24 @@ class ViewTest(TestCase): response = self.c.get('/rowers/workout/1/histo', form_data, follow=True) self.assertEqual(response.status_code, 200) - + form_data = { + 'name':'aap', + 'date':'2016-11-05', + 'starttime':'09:07:14', + 'duration':'1:00:00.5', + 'distance':'15000', + 'workouttype':'rower', + 'notes':'noot mies', + } + form = WorkoutForm(data=form_data) + self.assertTrue(form.is_valid()) + response = self.c.post('/rowers/workout/1/edit', form_data, follow=True) + self.assertRedirects(response, + expected_url='/rowers/workout/1/edit/s/Changes%20saved', + status_code=302,target_status_code=200) + - w = Workout.objects.get(id=1) + w = Workout.objects.get(id=1) f_to_be_deleted = w.csvfilename os.remove(f_to_be_deleted) diff --git a/rowers/views.py b/rowers/views.py index eded3d99..08b7e9e3 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -2867,7 +2867,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""): return HttpResponse("Error: CSV Data File Not Found") r.rowdatetime = startdatetime r.write_csv(row.csvfilename) - dataprep.update_strokedata(id,rowdata.df) + dataprep.update_strokedata(id,r.df) successmessage = "Changes saved" url = "/rowers/workout/"+str(row.id)+"/edit" url = reverse(workout_edit_view,