oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix final test

This commit is contained in:
Oliver Marks 2018-01-24 13:28:00 +00:00
parent 5008051d88
commit 1e18c2d2e0
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mhackspace/base/tests.py
View File

@ -17,7 +17,7 @@ class TestTasks(gocardlessMocks):
self.group = Group(name='members') self.group = Group(name='members')
self.group.save() self.group.save()
@mock.patch('mhackspace.subscriptions.payments.select_provider') @mock.patch('mhackspace.subscriptions.management.commands.update_membership_status.select_provider')
def test_refresh_subscriptions(self, mock_select_provider): def test_refresh_subscriptions(self, mock_select_provider):
self.mock_success_responses() self.mock_success_responses()
self.mock_mandate_success_responses() self.mock_mandate_success_responses()
@ -35,5 +35,5 @@ class TestTasks(gocardlessMocks):
self.mock_success_responses() self.mock_success_responses()
membership_count = Membership.objects.all().count() membership_count = Membership.objects.all().count()
self.assertEquals(2, membership_count) self.assertEquals(1, membership_count)
self.assertEquals(2, user_count) self.assertEquals(3, user_count)

12
mhackspace/subscriptions/payments.py
View File

@ -1,5 +1,3 @@
from pprint import pprint
import pytz
import gocardless_pro import gocardless_pro
import braintree import braintree
import logging import logging
@ -16,9 +14,9 @@ PROVIDER_NAME = {1: 'gocardless', 2: 'braintree'}
def select_provider(type): def select_provider(type):
if type == "gocardless": return gocardless_provider() if type == "gocardless": return gocardless_provider()
if type == "braintree": return braintree_provider() if type == "braintree": return braintree_provider()
if type == "paypal": return paypal_provider() # if type == "paypal": return paypal_provider()
log.exception('[scaffold] - "No Provider for ' + type) logger.exception('[scaffold] - "No Provider for ' + type)
assert 0, "No Provider for " + type assert 0, "No Provider for " + type
@ -49,12 +47,8 @@ class gocardless_provider:
'amount': payment.amount 'amount': payment.amount
} }
def fetch_subscriptions(self): def fetch_subscriptions(self):
# for paying_member in self.client.mandates.list().records: # for paying_member in self.client.mandates.list().records:
print('#############')
print(self.client.subscriptions.list())
print(self.client.subscriptions.list().records)
for paying_member in self.client.subscriptions.list().records: for paying_member in self.client.subscriptions.list().records:
mandate = self.client.mandates.get(paying_member.links.mandate) mandate = self.client.mandates.get(paying_member.links.mandate)
user = self.client.customers.get(mandate.links.customer) user = self.client.customers.get(mandate.links.customer)
@ -109,7 +103,6 @@ class gocardless_provider:
} }
}) })
def confirm_subscription(self, membership, session, provider_response, def confirm_subscription(self, membership, session, provider_response,
name, interval_unit='monthly', interval_length='1'): name, interval_unit='monthly', interval_length='1'):
r = provider_response.get('redirect_flow_id') r = provider_response.get('redirect_flow_id')
@ -191,4 +184,3 @@ class braintree_provider:
'start_date': paying_member.created_at, 'start_date': paying_member.created_at,
'reference': paying_member.reference, 'reference': paying_member.reference,
'amount': paying_member.amount} 'amount': paying_member.amount}