diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py index ab67cfb7..f07e45e0 100644 --- a/rowers/tests/test_payments.py +++ b/rowers/tests/test_payments.py @@ -499,10 +499,13 @@ class PaymentTest(TestCase): 'amount':'15.00', 'plan': plans[1].id, 'payment_method_nonce': 'aap', + 'tac':True, } form = BillingForm(form_data) - self.assertTrue(not form.is_valid()) + if not form.is_valid(): + print form.errors + self.assertTrue(form.is_valid()) login = self.c.login(username=u.username, password=self.password) self.assertTrue(login) @@ -512,9 +515,10 @@ class PaymentTest(TestCase): response = self.c.post(url, form_data,follow=True) self.assertEqual(response.status_code,200) + expected_url = '/rowers/paymentcompleted/?amount=20.00' + self.assertRedirects(response, - expected_url = '/rowers/checkout/{planid}/'.format( - planid=plans[1].id), + expected_url = expected_url, status_code=302,target_status_code=200) @@ -544,11 +548,11 @@ class PaymentTest(TestCase): 'amount':'15.00', 'plan': plans[1].id, 'payment_method_nonce': 'aap', - # 'tac':'tac', + 'tac':True, } form = BillingForm(form_data) - self.assertTrue(not form.is_valid()) + self.assertTrue(form.is_valid()) login = self.c.login(username=u.username, password=self.password) self.assertTrue(login) @@ -559,8 +563,7 @@ class PaymentTest(TestCase): self.assertEqual(response.status_code,200) self.assertRedirects(response, - expected_url = '/rowers/upgradecheckout/{planid}/'.format( - planid=plans[1].id), + 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) @@ -589,11 +592,11 @@ class PaymentTest(TestCase): 'amount':'15.00', 'plan': plans[1].id, 'payment_method_nonce': 'aap', - # 'tac':'tac', + 'tac':True, } form = BillingForm(form_data) - self.assertTrue(not form.is_valid()) + self.assertTrue(form.is_valid()) login = self.c.login(username=u.username, password=self.password) self.assertTrue(login) @@ -604,7 +607,6 @@ class PaymentTest(TestCase): self.assertEqual(response.status_code,200) self.assertRedirects(response, - expected_url = '/rowers/downgradecheckout/{planid}/'.format( - planid=plans[1].id), + expected_url = '/rowers/downgradecompleted/', status_code=302,target_status_code=200) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 2fe01ee9..07c79f24 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ