From abf413b3062ed103752d8faf817d44f8358e2166 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 23 Mar 2018 14:15:21 +0100 Subject: [PATCH] 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):