more pep

rowers/tests/test_payments.py

@@ -676,7 +676,6 @@ description: ""
         u.save()
 
         plans = PaidPlan.objects.all().order_by('price')
-        plan = plans[1]
 
         form_data = {
             'amount': '15.00',
@@ -780,8 +779,7 @@ description: ""
             'plan': plans[1].id,
             'payment_method_nonce': 'aap',
             'paymenttype': 'CreditCard',
-            'tac':True,
+            'tac': True, }
-            }
 
         form = BillingForm(form_data)
         self.assertTrue(form.is_valid())
@@ -797,49 +795,3 @@ description: ""
         self.assertRedirects(response,
                              expected_url='/rowers/paymentcompleted/?amount=20.00',
                              status_code=302, target_status_code=200)
-
-    @patch('rowers.views.braintreestuff.update_subscription', side_effect=mock_update_subscription)
-    @patch('rowers.braintreestuff.myqueue')
-    def test_downgrade_checkouts_view(self,mock_subscription,mocked_myqueue):
-        u = UserFactory()
-        r = Rower.objects.create(user=u,
-                                      birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,surveydone=True,
-                                      gdproptindate=timezone.now(),
-                                      rowerplan='coach',
-                                      paymentprocessor='braintree',
-                                      street_address = faker.street_address(),
-                                      city = faker.city(),
-                                      postal_code = faker.postalcode(),
-                                      country = faker.country(),
-        )
-
-        r.save()
-        u.set_password(self.password)
-        u.save()
-
-        plans = PaidPlan.objects.all().order_by('price')
-        plan = plans[1]
-
-        form_data = {
-            'amount':'15.00',
-            'plan': plans[1].id,
-            'payment_method_nonce': 'aap',
-            'paymenttype': 'CreditCard',
-            'tac':True,
-            }
-
-        form = BillingForm(form_data)
-        self.assertTrue(form.is_valid())
-
-        login = self.c.login(username=u.username, password=self.password)
-        self.assertTrue(login)
-
-        url = '/rowers/downgradecheckouts/'
-
-        response = self.c.post(url, form_data,follow=True)
-        self.assertEqual(response.status_code,200)
-
-        self.assertRedirects(response,
-                             expected_url = '/rowers/downgradecompleted/',
-                             status_code=302,target_status_code=200)

rowers/tests/test_simplefunctions.py

@@ -5,12 +5,13 @@ from __future__ import unicode_literals
 
 from .statements import *
 
-nu = datetime.datetime.now()
-
 from django.http import Http404
 
 from rowers.views import get_workout
 
+nu = datetime.datetime.now()
+
+
 class TestDateTime(TestCase):
     def setUp(self):
         self.factory = RequestFactory()
@@ -56,12 +57,10 @@ class SimpleViewTest(TestCase):
             except (IOError, FileNotFoundError, OSError):
                 pass
 
-
     def test_getrequestrower(self):
         user_no_rower = UserFactory(username='norower')
         user_no_rower.set_password(faker.word())
 
-
         login = self.c.login(username=self.u.username, password=self.password)
         self.assertTrue(login)
 
@@ -82,8 +81,7 @@ class SimpleViewTest(TestCase):
             'email': 'roosendaalsander@gmail.com',
             'subject': 'testing',
             'botcheck': True,
-            'message': faker.text()
+            'message': faker.text()}
-            }
 
         form = EmailForm(form_data)
 
@@ -96,10 +94,9 @@ class SimpleViewTest(TestCase):
                              expected_url='/rowers/email/',
                              status_code=302, target_status_code=200)
 
-
     def test_getworkout(self):
         with assert_raises(Http404):
-            w = get_workout(encoder.encode_hex(123))
+            _ = get_workout(encoder.encode_hex(123))
 
     def test_deactivate(self):
         login = self.c.login(username=self.u.username, password=self.password)
@@ -109,16 +106,12 @@ class SimpleViewTest(TestCase):
         response = self.c.get(url)
         self.assertEqual(response.status_code, 200)
 
-        form_data = {
+        form_data = {'is_active': True}
-            'is_active': True
-            }
 
         response = self.c.post(url, form_data)
         self.assertEqual(response.status_code, 200)
 
-        form_data = {
+        form_data = {'is_active': False}
-            'is_active': False
-            }
 
         response = self.c.post(url, form_data, follow=True)
         self.assertEqual(response.status_code, 200)