Fix the tests and implement a fake stripe.

endpoints/api/billing.py

@@ -1,7 +1,7 @@
 import stripe
 
 from flask import request
-
+from app import billing
 from endpoints.api import (resource, nickname, ApiResource, validate_json_request, log_action,
                            related_user_resource, internal_only, Unauthorized, NotFound,
                            require_user_admin, show_if, hide_if)
@@ -9,7 +9,7 @@ from endpoints.api.subscribe import subscribe, subscription_view
 from auth.permissions import AdministerOrganizationPermission
 from auth.auth_context import get_authenticated_user
 from data import model
-from data.plans import PLANS
+from data.billing import PLANS
 
 import features
 
@@ -23,7 +23,7 @@ def get_card(user):
   }
 
   if user.stripe_id:
-    cus = stripe.Customer.retrieve(user.stripe_id)
+    cus = billing.Customer.retrieve(user.stripe_id)
     if cus and cus.default_card:
       # Find the default card.
       default_card = None
@@ -44,7 +44,7 @@ def get_card(user):
 
 def set_card(user, token):
   if user.stripe_id:
-    cus = stripe.Customer.retrieve(user.stripe_id)
+    cus = billing.Customer.retrieve(user.stripe_id)
     if cus:
       try:
         cus.card = token
@@ -73,7 +73,7 @@ def get_invoices(customer_id):
       'plan': i.lines.data[0].plan.id if i.lines.data[0].plan else None
     }
     
-  invoices = stripe.Invoice.all(customer=customer_id, count=12)
+  invoices = billing.Invoice.all(customer=customer_id, count=12)
   return {
     'invoices': [invoice_view(i) for i in invoices.data]
   }
@@ -225,7 +225,7 @@ class UserPlan(ApiResource):
     private_repos = model.get_private_repo_count(user.username)
 
     if user.stripe_id:
-      cus = stripe.Customer.retrieve(user.stripe_id)
+      cus = billing.Customer.retrieve(user.stripe_id)
 
       if cus.subscription:                                
         return subscription_view(cus.subscription, private_repos)
@@ -285,7 +285,7 @@ class OrganizationPlan(ApiResource):
       private_repos = model.get_private_repo_count(orgname)
       organization = model.get_organization(orgname)
       if organization.stripe_id:
-        cus = stripe.Customer.retrieve(organization.stripe_id)
+        cus = billing.Customer.retrieve(organization.stripe_id)
 
         if cus.subscription:                                
           return subscription_view(cus.subscription, private_repos)

endpoints/api/organization.py

@@ -1,8 +1,8 @@
 import logging
-import stripe
 
 from flask import request
 
+from app import billing as stripe
 from endpoints.api import (resource, nickname, ApiResource, validate_json_request, request_error,
                            related_user_resource, internal_only, Unauthorized, NotFound,
                            require_user_admin, log_action, show_if)
@@ -12,7 +12,7 @@ from auth.permissions import (AdministerOrganizationPermission,  OrganizationMem
                               CreateRepositoryPermission)
 from auth.auth_context import get_authenticated_user
 from data import model
-from data.plans import get_plan
+from data.billing import get_plan
 from util.gravatar import compute_hash
 
 import features

endpoints/api/subscribe.py

@@ -1,10 +1,11 @@
 import logging
 import stripe
 
+from app import billing
 from endpoints.api import request_error, log_action, NotFound
 from endpoints.common import check_repository_usage
 from data import model
-from data.plans import PLANS
+from data.billing import PLANS
 
 import features
 
@@ -60,7 +61,7 @@ def subscribe(user, plan, token, require_business_plan):
       card = token
       
       try:
-        cus = stripe.Customer.create(email=user.email, plan=plan, card=card)
+        cus = billing.Customer.create(email=user.email, plan=plan, card=card)
         user.stripe_id = cus.id
         user.save()
         check_repository_usage(user, plan_found)
@@ -73,7 +74,7 @@ def subscribe(user, plan, token, require_business_plan):
 
   else:
     # Change the plan
-    cus = stripe.Customer.retrieve(user.stripe_id)
+    cus = billing.Customer.retrieve(user.stripe_id)
 
     if plan_found['price'] == 0:
       if cus.subscription is not None:

endpoints/api/user.py

@@ -1,19 +1,18 @@
 import logging
-import stripe
 import json
 
 from flask import request
 from flask.ext.login import logout_user
 from flask.ext.principal import identity_changed, AnonymousIdentity
 
-from app import app
+from app import app, billing as stripe
 from endpoints.api import (ApiResource, nickname, resource, validate_json_request, request_error,
                            log_action, internal_only, NotFound, require_user_admin,
                            InvalidToken, require_scope, format_date, hide_if, show_if)
 from endpoints.api.subscribe import subscribe
 from endpoints.common import common_login
 from data import model
-from data.plans import get_plan
+from data.billing import get_plan
 from auth.permissions import (AdministerOrganizationPermission, CreateRepositoryPermission,
                               UserAdminPermission, UserReadPermission)
 from auth.auth_context import get_authenticated_user

endpoints/web.py

@@ -1,5 +1,4 @@
 import logging
-import stripe
 import os
 
 from flask import (abort, redirect, request, url_for, make_response, Response,
@@ -9,7 +8,7 @@ from urlparse import urlparse
 
 from data import model
 from data.model.oauth import DatabaseAuthorizationProvider
-from app import app
+from app import app, billing as stripe
 from auth.permissions import AdministerOrganizationPermission
 from util.invoice import renderInvoiceToPdf
 from util.seo import render_snapshot

endpoints/webhooks.py

@@ -1,9 +1,9 @@
 import logging
-import stripe
 import json
 
 from flask import request, make_response, Blueprint
 
+from app import billing as stripe
 from data import model
 from data.queue import dockerfile_build_queue
 from auth.auth import process_auth