From a72863deec0356a558ce2c0c107cf34a4434a78a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 23 Mar 2018 13:36:12 +0100 Subject: [PATCH 1/3] changes in tests to accomodate rower has opted in to gdpr --- rowers/tests.py | 52 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/rowers/tests.py b/rowers/tests.py index ce4ca872..b081e398 100644 --- a/rowers/tests.py +++ b/rowers/tests.py @@ -10,6 +10,7 @@ import rowers.interactiveplots as iplots import datetime from rowingdata import rowingdata as rdata from rowingdata import rower as rrower +from django.utils import timezone from rowers.rows import handle_uploaded_file from django.core.files.uploadedfile import SimpleUploadedFile from time import strftime,strptime,mktime,time,daylight @@ -68,7 +69,9 @@ class C2Objects(DjangoTestCase): u.first_name = 'John' u.last_name = 'Sander' u.save() - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) res = add_workout_from_strokedata(u,1,data,strokedata,source='c2') @@ -91,7 +94,10 @@ class C2Objects(DjangoTestCase): u.first_name = 'John' u.last_name = 'Sander' u.save() - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) + res = add_workout_from_strokedata(u,1,data,strokedata,source='c2') @@ -168,7 +174,10 @@ class StravaObjects(DjangoTestCase): u.first_name = 'John' u.last_name = 'Sander' u.save() - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) + res = add_workout_from_strokedata(u,1,workoutsummary,strokedata, source='strava') @@ -244,7 +253,9 @@ class StravaObjects(DjangoTestCase): u.first_name = 'John' u.last_name = 'Sander' u.save() - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) res = add_workout_from_strokedata(u,1,workoutsummary,strokedata, source='strava') @@ -261,7 +272,10 @@ class STObjects(DjangoTestCase): u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) + res = add_workout_from_stdata(u,1,data) @@ -274,7 +288,11 @@ class STObjects(DjangoTestCase): u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - r = Rower.objects.create(user=u) + + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) + res = add_workout_from_stdata(u,1,data) @@ -329,7 +347,10 @@ class EmailTests(TestCase): u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) + nu = datetime.datetime.now() workoutsbox = Mailbox.objects.create(name='workouts') workoutsbox.save() @@ -367,7 +388,9 @@ class WorkoutTests(TestCase): u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) nu = datetime.datetime.now() w = Workout.objects.create(name='testworkout',workouttype='On-water', user=r,date=nu.strftime('%Y-%m-%d'), @@ -376,7 +399,10 @@ class WorkoutTests(TestCase): def test_checkworkoutuser(self): u = User.objects.get(username='john') - r = Rower.objects.get(user=u) + + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) w = Workout.objects.get(user=r) self.assertEqual(checkworkoutuser(u,w),True) @@ -387,7 +413,9 @@ class C2Tests(TestCase): self.u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - self.r = Rower.objects.create(user=u) + self.r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) self.nu = datetime.datetime.now() self.w = Workout.objects.create(name='testworkout',workouttype='On-water', user=r,date=nu.strftime('%Y-%m-%d'), @@ -405,7 +433,9 @@ class DataTest(TestCase): u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - r = Rower.objects.create(user=u) + r = Rower.objects.create(user=u,gdproptin=True, + gdproptindate=timezone.today() + ) self.nu = datetime.datetime.now() From 965d44cd37ec86ee5040356d3a99afe795c8090b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 23 Mar 2018 13:45:05 +0100 Subject: [PATCH 2/3] further tests debug --- rowers/tests.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/rowers/tests.py b/rowers/tests.py index b081e398..55112808 100644 --- a/rowers/tests.py +++ b/rowers/tests.py @@ -70,7 +70,7 @@ class C2Objects(DjangoTestCase): u.last_name = 'Sander' u.save() r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) res = add_workout_from_strokedata(u,1,data,strokedata,source='c2') @@ -95,7 +95,7 @@ class C2Objects(DjangoTestCase): u.last_name = 'Sander' u.save() r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) @@ -175,7 +175,7 @@ class StravaObjects(DjangoTestCase): u.last_name = 'Sander' u.save() r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) @@ -254,7 +254,7 @@ class StravaObjects(DjangoTestCase): u.last_name = 'Sander' u.save() r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) res = add_workout_from_strokedata(u,1,workoutsummary,strokedata, @@ -273,7 +273,7 @@ class STObjects(DjangoTestCase): 'sander@ds.ds', 'koeinsloot') r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) @@ -290,7 +290,7 @@ class STObjects(DjangoTestCase): 'koeinsloot') r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) @@ -348,7 +348,7 @@ class EmailTests(TestCase): 'sander@ds.ds', 'koeinsloot') r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) nu = datetime.datetime.now() @@ -389,7 +389,7 @@ class WorkoutTests(TestCase): 'sander@ds.ds', 'koeinsloot') r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) nu = datetime.datetime.now() w = Workout.objects.create(name='testworkout',workouttype='On-water', @@ -401,7 +401,7 @@ class WorkoutTests(TestCase): u = User.objects.get(username='john') r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) w = Workout.objects.get(user=r) @@ -413,8 +413,8 @@ class C2Tests(TestCase): self.u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - self.r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + self.r = Rower.objects.create(user=self.u,gdproptin=True, + gdproptindate=timezone.now() ) self.nu = datetime.datetime.now() self.w = Workout.objects.create(name='testworkout',workouttype='On-water', @@ -434,7 +434,7 @@ class DataTest(TestCase): 'sander@ds.ds', 'koeinsloot') r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.today() + gdproptindate=timezone.now() ) self.nu = datetime.datetime.now() @@ -616,7 +616,9 @@ class ViewTest(TestCase): self.u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - self.r = Rower.objects.create(user=self.u) + self.r = Rower.objects.create(user=self.u,gdproptin=True, + gdproptindate=timezone.now() + ) self.nu = datetime.datetime.now() def test_upload_view_notloggedin(self): From abf413b3062ed103752d8faf817d44f8358e2166 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 23 Mar 2018 14:15:21 +0100 Subject: [PATCH 3/3] further tests.py refinement --- rowers/tests.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/rowers/tests.py b/rowers/tests.py index 55112808..0e6df0f0 100644 --- a/rowers/tests.py +++ b/rowers/tests.py @@ -385,27 +385,21 @@ class EmailTests(TestCase): class WorkoutTests(TestCase): def setUp(self): redis_connection.publish('tasks','KILL') - u = User.objects.create_user('john', + self.u = User.objects.create_user('john', 'sander@ds.ds', 'koeinsloot') - r = Rower.objects.create(user=u,gdproptin=True, + self.r = Rower.objects.create(user=self.u,gdproptin=True, gdproptindate=timezone.now() ) nu = datetime.datetime.now() - w = Workout.objects.create(name='testworkout',workouttype='On-water', - user=r,date=nu.strftime('%Y-%m-%d'), + self.w = Workout.objects.create(name='testworkout', + workouttype='On-water', + user=self.r,date=nu.strftime('%Y-%m-%d'), starttime=nu.strftime('%H:%M:%S'), duration="0:55:00",distance=8000) def test_checkworkoutuser(self): - u = User.objects.get(username='john') - - r = Rower.objects.create(user=u,gdproptin=True, - gdproptindate=timezone.now() - ) - w = Workout.objects.get(user=r) - - self.assertEqual(checkworkoutuser(u,w),True) + self.assertEqual(checkworkoutuser(self.u,self.w),True) class C2Tests(TestCase): def setUp(self):