From 4203759cd7e8202fccdd10d094c7a60c9ce76b80 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 7 Jan 2019 21:34:32 +0100 Subject: [PATCH] working test for activity chart --- rowers/interactiveplots.py | 2 +- rowers/tests/test_models.py | 17 ++++++++++++++--- rowers/tests/testdata/testdata.csv.gz | Bin 11511 -> 11511 bytes rowers/views.py | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 2efc1487..f578b5d1 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -248,7 +248,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'): rowersinitials = {} seen = ['seen'] idseen = [] - + for w in workouts: aantal=1 initials = w.user.user.first_name[0:aantal]+w.user.user.last_name[0:aantal] diff --git a/rowers/tests/test_models.py b/rowers/tests/test_models.py index 8e5ea90d..187797ea 100644 --- a/rowers/tests/test_models.py +++ b/rowers/tests/test_models.py @@ -283,15 +283,26 @@ class ListWorkoutTest(TestCase): @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.getsmallrowdata_db') - def list_workouts(self, mocked_sqlalchemy, + def test_list_workouts(self, mocked_sqlalchemy, mocked_getsmallrowdata_db): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) - + + startdate = (self.user_workouts[0].startdatetime-datetime.timedelta(days=3)).date() + enddate = (self.user_workouts[0].startdatetime+datetime.timedelta(days=3)).date() + + form_data = { + 'startdate':startdate, + 'enddate':enddate, + } + + workouts = Workout.objects.filter(startdatetime__gte=startdate, + startdatetime__lte=enddate) + url = '/rowers/list-workouts/' - response = self.c.get(url) + response = self.c.post(url, form_data) self.assertEqual(response.status_code,200) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index ffe8f9fa73ec93e0dcdd8aa0edf463afb0fe747e..782e0f56dbf65aa474196666be4249b09be2fb2d 100644 GIT binary patch delta 15 Wcmew!`8|?NzMF&N%C?PcA9VmYS_Z!W delta 15 Wcmew!`8|?NzMF&N(29+0A9VmXs0N<^ diff --git a/rowers/views.py b/rowers/views.py index 1f844d88..f9a29d7a 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -7717,6 +7717,7 @@ def workouts_view(request,message='',successmessage='', g_startdate, g_enddate, stack=stack) + messages.info(request,successmessage) messages.error(request,message)