Private
Public Access
1
0

changes in tests to accomodate rower has opted in to gdpr

This commit is contained in:
Sander Roosendaal
2018-03-23 13:36:12 +01:00
parent 5f5e873fbd
commit a72863deec

View File

@@ -10,6 +10,7 @@ import rowers.interactiveplots as iplots
import datetime import datetime
from rowingdata import rowingdata as rdata from rowingdata import rowingdata as rdata
from rowingdata import rower as rrower from rowingdata import rower as rrower
from django.utils import timezone
from rowers.rows import handle_uploaded_file from rowers.rows import handle_uploaded_file
from django.core.files.uploadedfile import SimpleUploadedFile from django.core.files.uploadedfile import SimpleUploadedFile
from time import strftime,strptime,mktime,time,daylight from time import strftime,strptime,mktime,time,daylight
@@ -68,7 +69,9 @@ class C2Objects(DjangoTestCase):
u.first_name = 'John' u.first_name = 'John'
u.last_name = 'Sander' u.last_name = 'Sander'
u.save() 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') res = add_workout_from_strokedata(u,1,data,strokedata,source='c2')
@@ -91,7 +94,10 @@ class C2Objects(DjangoTestCase):
u.first_name = 'John' u.first_name = 'John'
u.last_name = 'Sander' u.last_name = 'Sander'
u.save() 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') res = add_workout_from_strokedata(u,1,data,strokedata,source='c2')
@@ -168,7 +174,10 @@ class StravaObjects(DjangoTestCase):
u.first_name = 'John' u.first_name = 'John'
u.last_name = 'Sander' u.last_name = 'Sander'
u.save() 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, res = add_workout_from_strokedata(u,1,workoutsummary,strokedata,
source='strava') source='strava')
@@ -244,7 +253,9 @@ class StravaObjects(DjangoTestCase):
u.first_name = 'John' u.first_name = 'John'
u.last_name = 'Sander' u.last_name = 'Sander'
u.save() 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, res = add_workout_from_strokedata(u,1,workoutsummary,strokedata,
source='strava') source='strava')
@@ -261,7 +272,10 @@ class STObjects(DjangoTestCase):
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') '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) res = add_workout_from_stdata(u,1,data)
@@ -274,7 +288,11 @@ class STObjects(DjangoTestCase):
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') '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) res = add_workout_from_stdata(u,1,data)
@@ -329,7 +347,10 @@ class EmailTests(TestCase):
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')
r = Rower.objects.create(user=u) r = Rower.objects.create(user=u,gdproptin=True,
gdproptindate=timezone.today()
)
nu = datetime.datetime.now() nu = datetime.datetime.now()
workoutsbox = Mailbox.objects.create(name='workouts') workoutsbox = Mailbox.objects.create(name='workouts')
workoutsbox.save() workoutsbox.save()
@@ -367,7 +388,9 @@ class WorkoutTests(TestCase):
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')
r = Rower.objects.create(user=u) r = Rower.objects.create(user=u,gdproptin=True,
gdproptindate=timezone.today()
)
nu = datetime.datetime.now() nu = datetime.datetime.now()
w = Workout.objects.create(name='testworkout',workouttype='On-water', w = Workout.objects.create(name='testworkout',workouttype='On-water',
user=r,date=nu.strftime('%Y-%m-%d'), user=r,date=nu.strftime('%Y-%m-%d'),
@@ -376,7 +399,10 @@ class WorkoutTests(TestCase):
def test_checkworkoutuser(self): def test_checkworkoutuser(self):
u = User.objects.get(username='john') 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) w = Workout.objects.get(user=r)
self.assertEqual(checkworkoutuser(u,w),True) self.assertEqual(checkworkoutuser(u,w),True)
@@ -387,7 +413,9 @@ class C2Tests(TestCase):
self.u = User.objects.create_user('john', self.u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') '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.nu = datetime.datetime.now()
self.w = Workout.objects.create(name='testworkout',workouttype='On-water', self.w = Workout.objects.create(name='testworkout',workouttype='On-water',
user=r,date=nu.strftime('%Y-%m-%d'), user=r,date=nu.strftime('%Y-%m-%d'),
@@ -405,7 +433,9 @@ class DataTest(TestCase):
u = User.objects.create_user('john', u = User.objects.create_user('john',
'sander@ds.ds', 'sander@ds.ds',
'koeinsloot') 'koeinsloot')
r = Rower.objects.create(user=u) r = Rower.objects.create(user=u,gdproptin=True,
gdproptindate=timezone.today()
)
self.nu = datetime.datetime.now() self.nu = datetime.datetime.now()