committing survey

rowers/tests/test_team.py

@@ -38,10 +38,10 @@ class TeamTest(TestCase):
         for i in range(6):
             u = UserFactory(username=usernames[i])
             self.users.append(u)
-        
+
             r = Rower.objects.create(
                 birthdate=faker.profile()['birthdate'],
-                gdproptin=True,
+                gdproptin=True,surveydone=True,
                 gdproptindate=timezone.now(),
                 rowerplan='coach',
                 user=u,
@@ -53,7 +53,7 @@ class TeamTest(TestCase):
             u.set_password(password)
             u.save()
             self.user_passwords.append(password)
-            
+
 
             workouts = WorkoutFactory.create_batch(5, user=r)
             for w in workouts:
@@ -64,7 +64,7 @@ class TeamTest(TestCase):
 
         self.u = self.users[0]
         self.password = self.user_passwords[0]
-        
+
         self.t = TeamFactory(manager=self.u)
 
         # need to set up some requests for testing (they are not good below)
@@ -105,7 +105,7 @@ class TeamTest(TestCase):
         self.assertRedirects(response,
                              expected_url='/rowers/me/teams/'.format(t=self.t.id),
                              status_code=302,target_status_code=200)
-        
+
     def test_teamview(self):
         login = self.c.login(username=self.u.username, password = self.password)
         self.assertTrue(login)
@@ -113,9 +113,9 @@ class TeamTest(TestCase):
         url = '/rowers/team/{t}/'.format(t=self.t.id)
         response = self.c.get(url)
         self.assertEqual(response.status_code, 200)
-            
+
     def test_teamview_member(self):
-        
+
         id,comment = add_member(self.t.id,self.users[1].rower)
         self.assertEqual(id,self.t.id)
 
@@ -132,7 +132,7 @@ class TeamTest(TestCase):
 
         login = self.c.login(username=self.users[2].username, password = self.user_passwords[2])
         self.assertTrue(login)
-        
+
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
 
@@ -147,11 +147,11 @@ class TeamTest(TestCase):
                     print(u)
                     print(response.status_code)
                 self.assertIn(response.status_code,[200,302])
-        
+
         login = self.c.login(username=self.users[1].username,
                              password = self.user_passwords[1])
         self.assertTrue(login)
-        
+
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
 
@@ -166,14 +166,14 @@ class TeamTest(TestCase):
                     print(u)
                     print(response.status_code)
                 self.assertIn(response.status_code,[200,302])
-        
+
     def test_teamsview_manager(self):
 
         url = '/rowers/me/teams/'
 
         login = self.c.login(username=self.u,password=self.password)
         self.assertTrue(login)
-        
+
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
 
@@ -190,14 +190,14 @@ class TeamTest(TestCase):
                 self.assertIn(response.status_code,[200,302])
 
     def test_teamview_member_request(self):
-        
+
         login = self.c.login(username=self.users[3].username, password = self.user_passwords[3])
         self.assertTrue(login)
 
         url = '/rowers/team/{t}/requestmembership/{u}/'.format(
             t=self.t.id,
             u=self.users[3].id)
-        
+
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code, 200)
 
@@ -226,8 +226,8 @@ class TeamTest(TestCase):
         self.assertRedirects(response,
                              expected_url='/rowers/me/teams/',
                              status_code=302,target_status_code=200)
-        
-        
+
+
     def test_team_invite_view(self):
         login = self.c.login(username=self.u.username, password = self.password)
         self.assertTrue(login)
@@ -238,11 +238,11 @@ class TeamTest(TestCase):
             'email': self.users[1].email,
             'user': u''
             }
-        
+
         response = self.c.post(url, form_data)
         self.assertEqual(response.status_code, 200)
-            
-@override_settings(TESTING=True)        
+
+@override_settings(TESTING=True)
 class TeamTestLowLevel(TestCase):
     def setUp(self):
         redis_connection.publish('tasks','KILL')
@@ -261,10 +261,10 @@ class TeamTestLowLevel(TestCase):
         for i in range(6):
             u = UserFactory(username=usernames[i])
             self.users.append(u)
-        
+
             r = Rower.objects.create(
                 birthdate=faker.profile()['birthdate'],
-                gdproptin=True,
+                gdproptin=True,surveydone=True,
                 gdproptindate=timezone.now(),
                 rowerplan='coach',
                 user=u,
@@ -276,7 +276,7 @@ class TeamTestLowLevel(TestCase):
             u.set_password(password)
             u.save()
             self.user_passwords.append(password)
-            
+
 
             workouts = WorkoutFactory.create_batch(5, user=r)
             for w in workouts:
@@ -287,7 +287,7 @@ class TeamTestLowLevel(TestCase):
 
         self.u = self.users[0]
         self.password = self.user_passwords[0]
-        
+
         self.t = TeamFactory(manager=self.u)
 
 
@@ -353,5 +353,3 @@ class TeamTestLowLevel(TestCase):
         # cannot create invite for team you don't manage
         id, comment = create_invite(self.t, self.users[3],self.users[4])
         self.assertEqual(id,0)
-
-