Merge tag 'v6.33' into develop

GDPR release

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.now()
+        )
 
 	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.now()
+        )
+
 
 	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.now()
+        )
+
 
 	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.now()
+        )
 
 	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.now()
+        )
+
 
 	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.now()
+        )
+
 
 	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.now()
+        )
+	
 	nu = datetime.datetime.now()
         workoutsbox = Mailbox.objects.create(name='workouts')
         workoutsbox.save()
@@ -364,22 +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)
+	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',
+	self.w = Workout.objects.create(name='testworkout',
-				   user=r,date=nu.strftime('%Y-%m-%d'),
+                                        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')
+	self.assertEqual(checkworkoutuser(self.u,self.w),True)
-	r = Rower.objects.get(user=u)
-	w = Workout.objects.get(user=r)
-
-	self.assertEqual(checkworkoutuser(u,w),True)
 
 class C2Tests(TestCase):
     def setUp(self):
@@ -387,7 +407,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=self.u,gdproptin=True,
+                                 gdproptindate=timezone.now()
+        )
 	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 +427,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.now()
+        )
 	self.nu = datetime.datetime.now()
 
 
@@ -586,7 +610,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):