merge mess up

SumOfUs · Dec 14, 2017 · b657042 · b657042
2 parents c88ccbb + 6fe9234
commit b657042
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/lib/clients/braintree/braintree.js b/lib/clients/braintree/braintree.js
@@ -48,6 +48,7 @@ export const client = braintree.connect({
 });
 
 export function cancelSubscription(id: string) {
+  console.log('IN CANCEL SUBSCRIPTION');
   return client.subscription.cancel(id).then(resp => {
     return resp.success ? Promise.resolve(resp) : Promise.reject(resp);
   });

diff --git a/payments-service/subscriptions.test.js b/payments-service/subscriptions.test.js
@@ -1,8 +1,4 @@
 // @flow weak
-// Mock our local braintree client in lib/clients/braintree
-jest.mock('../lib/clients/braintree/braintree', () => ({
-  client: { subscription: { cancel: jest.fn(() => ({ success: true })) } },
-}));
 
 import {
   cancelSubscription,
@@ -60,10 +56,3 @@ describe('handler', () => {
     });
   });
 });
-
-describe('cancelSubscription', function() {
-  test.skip('handles braintree subscriptions', () => {
-    cancelSubscription('1234', 'braintree');
-    expect(client.subscription.cancel).toHaveBeenCalledWith('1234');
-  });
-});