fixed test and unpegged stripe

lemuelbarango · lemuelbarango · commit e3ae327d3ab9 · 2016-08-28T23:04:42.000-04:00
diff --git a/app/services/payola/cancel_subscription.rb b/app/services/payola/cancel_subscription.rb
@@ -2,8 +2,9 @@ module Payola
   class CancelSubscription
     def self.call(subscription, options = {})
       secret_key = Payola.secret_key_for_sale(subscription)
-      customer = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key)
-      customer.subscriptions.retrieve(subscription.stripe_id, secret_key).delete(options, secret_key)
+      Stripe.api_key = secret_key
+      customer = Stripe::Customer.retrieve(subscription.stripe_customer_id)
+      customer.subscriptions.retrieve(subscription.stripe_id).delete(options)
       
       if options[:at_period_end] == true
         # Store that the subscription will be canceled at the end of the billing period
diff --git a/app/services/payola/change_subscription_plan.rb b/app/services/payola/change_subscription_plan.rb
@@ -2,6 +2,7 @@ module Payola
   class ChangeSubscriptionPlan
     def self.call(subscription, plan, quantity = 1, coupon_code = nil)
       secret_key = Payola.secret_key_for_sale(subscription)
+      Stripe.api_key = secret_key
       old_plan = subscription.plan
 
       begin
@@ -26,7 +27,7 @@ def self.call(subscription, plan, quantity = 1, coupon_code = nil)
     end
 
     def self.retrieve_subscription_for_customer(subscription, secret_key)
-      customer = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key)
+      customer = Stripe::Customer.retrieve(subscription.stripe_customer_id)
       customer.subscriptions.retrieve(subscription.stripe_id)
     end
 
diff --git a/app/services/payola/change_subscription_quantity.rb b/app/services/payola/change_subscription_quantity.rb
@@ -5,7 +5,8 @@ def self.call(subscription, quantity)
       old_quantity = subscription.quantity
 
       begin
-        customer = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key)
+        Stripe.api_key = secret_key
+        customer = Stripe::Customer.retrieve(subscription.stripe_customer_id)
         sub = customer.subscriptions.retrieve(subscription.stripe_id)
         sub.quantity = quantity
         sub.save
diff --git a/app/services/payola/charge_card.rb b/app/services/payola/charge_card.rb
@@ -22,13 +22,14 @@ def self.call(sale)
     end
 
     def self.create_customer(sale, secret_key)
+      Stripe.api_key = secret_key
       if sale.stripe_customer_id.present?
-        Stripe::Customer.retrieve(sale.stripe_customer_id, secret_key)
+        Stripe::Customer.retrieve(sale.stripe_customer_id)
       else
         Stripe::Customer.create({
           source: sale.stripe_token,
           email: sale.email
-        }, secret_key)
+        })
       end
     end
 
@@ -40,14 +41,16 @@ def self.create_charge(sale, customer, secret_key)
         description: sale.guid,
       }.merge(Payola.additional_charge_attributes.call(sale, customer))
 
-      Stripe::Charge.create(charge_attributes, secret_key)
+      Stripe.api_key = secret_key
+      Stripe::Charge.create(charge_attributes)
     end
 
     def self.update_sale(sale, customer, charge, secret_key)
       if charge.respond_to?(:fee)
         fee = charge.fee
       else
-        balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction, secret_key)
+        Stripe.api_key = secret_key
+        balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction)
         fee = balance.fee
       end
 
diff --git a/app/services/payola/create_card.rb b/app/services/payola/create_card.rb
@@ -2,8 +2,9 @@ module Payola
   class CreateCard
     def self.call(stripe_customer_id, token)
       secret_key = Payola.secret_key
-      card_fingerprint = Stripe::Token.retrieve(token, secret_key).try(:card).try(:fingerprint)
-      customer = Stripe::Customer.retrieve(stripe_customer_id, secret_key)
+      Stripe.api_key = secret_key
+      card_fingerprint = Stripe::Token.retrieve(token).try(:card).try(:fingerprint)
+      customer = Stripe::Customer.retrieve(stripe_customer_id)
 
       unless customer.sources.select{|source| source.fingerprint == card_fingerprint}.any?
         customer.sources.create(source: token)
diff --git a/app/services/payola/create_plan.rb b/app/services/payola/create_plan.rb
@@ -2,9 +2,9 @@ module Payola
   class CreatePlan
     def self.call(plan)
       secret_key = Payola.secret_key_for_sale(plan)
-
+      Stripe.api_key = secret_key
       begin
-        return Stripe::Plan.retrieve(plan.stripe_id, secret_key)
+        return Stripe::Plan.retrieve(plan.stripe_id)
       rescue Stripe::InvalidRequestError
         # fall through
       end
@@ -17,7 +17,7 @@ def self.call(plan)
         interval_count:    plan.respond_to?(:interval_count) ? plan.interval_count : nil,
         currency:          plan.respond_to?(:currency) ? plan.currency : Payola.default_currency,
         trial_period_days: plan.respond_to?(:trial_period_days) ? plan.trial_period_days : nil
-      }, secret_key)
+      })
     end
   end
 end
diff --git a/app/services/payola/create_sale.rb b/app/services/payola/create_sale.rb
@@ -6,7 +6,8 @@ def self.call(params)
       coupon    = params[:coupon]
 
       if params[:stripe_customer_id].present?
-        customer = Stripe::Customer.retrieve(params[:stripe_customer_id], Payola.secret_key)
+        Stripe.api_key = Payola.secret_key
+        customer = Stripe::Customer.retrieve(params[:stripe_customer_id])
         email = customer.email
         token = customer.default_source
       else
diff --git a/app/services/payola/create_subscription.rb b/app/services/payola/create_subscription.rb
@@ -5,7 +5,8 @@ def self.call(params, owner=nil)
       affiliate = params[:affiliate]
 
       if params[:stripe_customer_id].present?
-        customer = Stripe::Customer.retrieve(params[:stripe_customer_id], Payola.secret_key)
+        Stripe.api_key = Payola.secret_key
+        customer = Stripe::Customer.retrieve(params[:stripe_customer_id])
         email = customer.email
       else
         email = params[:stripeEmail]
diff --git a/app/services/payola/destroy_card.rb b/app/services/payola/destroy_card.rb
@@ -2,7 +2,8 @@ module Payola
   class DestroyCard
     def self.call(card_id, stripe_customer_id)
       secret_key = Payola.secret_key
-      customer = Stripe::Customer.retrieve(stripe_customer_id, secret_key)
+      Stripe.api_key = secret_key
+      customer = Stripe::Customer.retrieve(stripe_customer_id)
       customer.sources.retrieve(card_id).delete()
     end
   end
diff --git a/app/services/payola/invoice_behavior.rb b/app/services/payola/invoice_behavior.rb
@@ -13,12 +13,13 @@ def create_sale_from_event(event)
         subscription = Payola::Subscription.find_by!(stripe_id: invoice.subscription)
         secret_key = Payola.secret_key_for_sale(subscription)
 
-        stripe_sub = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key).subscriptions.retrieve(invoice.subscription, secret_key)
+        Stripe.api_key = secret_key
+        stripe_sub = Stripe::Customer.retrieve(subscription.stripe_customer_id).subscriptions.retrieve(invoice.subscription)
         subscription.sync_with!(stripe_sub)
 
         sale = create_sale(subscription, invoice)
 
-        charge = Stripe::Charge.retrieve(invoice.charge, secret_key)
+        charge = Stripe::Charge.retrieve(invoice.charge)
 
         update_sale_with_charge(sale, charge, secret_key)
 
@@ -45,7 +46,8 @@ def update_sale_with_charge(sale, charge, secret_key)
         if charge.respond_to?(:fee)
           sale.fee_amount = charge.fee
         elsif !charge.balance_transaction.nil?
-          balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction, secret_key)
+          Stripe.api_key = secret_key
+          balance = Stripe::BalanceTransaction.retrieve(charge.balance_transaction)
           sale.fee_amount = balance.fee
         end
       end
diff --git a/app/services/payola/process_refund.rb b/app/services/payola/process_refund.rb
@@ -5,8 +5,8 @@ def self.call(guid)
       
       begin
         secret_key = Payola.secret_key
-    
-        charge = Stripe::Charge.retrieve(sale.stripe_id, secret_key)
+        Stripe.api_key = secret_key
+        charge = Stripe::Charge.retrieve(sale.stripe_id)
         charge.refund
 
         sale.refund!
diff --git a/app/services/payola/start_subscription.rb b/app/services/payola/start_subscription.rb
@@ -5,6 +5,7 @@ class StartSubscription
     def self.call(subscription)
       subscription.save!
       secret_key = Payola.secret_key_for_sale(subscription)
+      Stripe.api_key = secret_key
 
       new(subscription, secret_key).run
     end
@@ -72,7 +73,7 @@ def find_or_create_customer
 
       if stripe_customer_id
         # Retrieve the customer from Stripe and use it for this subscription
-        customer = Stripe::Customer.retrieve(stripe_customer_id, secret_key)
+        customer = Stripe::Customer.retrieve(stripe_customer_id)
 
         unless customer.try(:deleted)
           if customer.default_source.nil? && subscription.stripe_token.present?
@@ -93,7 +94,7 @@ def find_or_create_customer
         email:  subscription.email
       }
 
-      customer = Stripe::Customer.create(customer_create_params, secret_key)
+      customer = Stripe::Customer.create(customer_create_params)
 
       if subscription.setup_fee.present?
         plan = subscription.plan
@@ -103,7 +104,7 @@ def find_or_create_customer
           amount: subscription.setup_fee,
           currency: subscription.currency,
           description: description
-        }, secret_key)
+        })
       end
 
       customer
diff --git a/app/services/payola/update_card.rb b/app/services/payola/update_card.rb
@@ -3,13 +3,14 @@ class UpdateCard
     def self.call(subscription, token)
       secret_key = Payola.secret_key_for_sale(subscription)
       begin
-        customer = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key)
+        Stripe.api_key = secret_key
+        customer = Stripe::Customer.retrieve(subscription.stripe_customer_id)
 
         customer.source = token
         customer.save
 
-        customer = Stripe::Customer.retrieve(subscription.stripe_customer_id, secret_key)
-        card = customer.sources.retrieve(customer.default_source, secret_key)
+        customer = Stripe::Customer.retrieve(subscription.stripe_customer_id)
+        card = customer.sources.retrieve(customer.default_source)
 
         subscription.update_attributes(
           card_type: card.brand,
diff --git a/app/services/payola/update_customer.rb b/app/services/payola/update_customer.rb
@@ -2,7 +2,8 @@ module Payola
   class UpdateCustomer
     def self.call(stripe_customer_id, options)
       secret_key = Payola.secret_key
-      customer = Stripe::Customer.retrieve(stripe_customer_id, secret_key)
+      Stripe.api_key = secret_key
+      customer = Stripe::Customer.retrieve(stripe_customer_id)
       customer.save(options.to_h)
     end
   end
diff --git a/lib/payola.rb b/lib/payola.rb
@@ -122,7 +122,8 @@ class Retriever
     def self.call(params)
       return nil if StripeWebhook.exists?(stripe_id: params[:id])
       StripeWebhook.create!(stripe_id: params[:id])
-      event = Stripe::Event.retrieve(params[:id], { api_key: Payola.secret_key })
+      Stripe.api_key = Payola.secret_key
+      event = Stripe::Event.retrieve(params[:id])
       Payola.event_filter.call(event)
     end
   end
diff --git a/spec/services/payola/charge_card_spec.rb b/spec/services/payola/charge_card_spec.rb
@@ -4,6 +4,9 @@ module Payola
   describe ChargeCard do
     let(:stripe_helper) { StripeMock.create_test_helper }
     describe "#call" do
+      before do
+        expect(Stripe::BalanceTransaction).to receive(:retrieve).and_return(OpenStruct.new( amount: 100, fee: 3.29, currency: 'usd' ))
+      end
       it "should create a customer" do
         sale = create(:sale, state: 'processing', stripe_token: stripe_helper.generate_card_token)
         ChargeCard.call(sale)
@@ -33,16 +36,16 @@ module Payola
         ChargeCard.call(sale)
         expect(sale.reload.fee_amount).to_not be_nil        
       end
+    end
 
-      describe "on error" do
-        it "should update the error attribute" do
+    describe "on error" do
+      it "should update the error attribute" do
 
-          StripeMock.prepare_card_error(:card_declined)
-          sale = create(:sale, state: 'processing', stripe_token: stripe_helper.generate_card_token)
-          ChargeCard.call(sale)
-          expect(sale.reload.error).to_not be_nil
-          expect(sale.errored?).to be true
-        end
+        StripeMock.prepare_card_error(:card_declined)
+        sale = create(:sale, state: 'processing', stripe_token: stripe_helper.generate_card_token)
+        ChargeCard.call(sale)
+        expect(sale.reload.error).to_not be_nil
+        expect(sale.errored?).to be true
       end
     end
   end
diff --git a/spec/services/payola/invoice_failed_spec.rb b/spec/services/payola/invoice_failed_spec.rb
@@ -15,6 +15,7 @@ module Payola
       sub = create(:subscription, plan: plan, stripe_customer_id: customer.id, stripe_id: customer.subscriptions.first.id)
 
       charge = Stripe::Charge.create(amount: 100, currency: 'usd', failure_message: 'Failed! OMG!')
+      expect(Stripe::BalanceTransaction).to receive(:retrieve).and_return(OpenStruct.new( amount: 100, fee: 3.29, currency: 'usd' ))
       event = StripeMock.mock_webhook_event('invoice.payment_failed', subscription: sub.stripe_id, charge: charge.id)
 
       count = Payola::Sale.count
diff --git a/spec/services/payola/invoice_paid_spec.rb b/spec/services/payola/invoice_paid_spec.rb
@@ -35,6 +35,7 @@ module Payola
       sub = create(:subscription, plan: plan, stripe_customer_id: customer.id, stripe_id: customer.subscriptions.first.id)
 
       charge = Stripe::Charge.create(amount: 100, currency: 'usd')
+      expect(Stripe::BalanceTransaction).to receive(:retrieve).and_return(OpenStruct.new( amount: 100, fee: 3.29, currency: 'usd' ))
       event = StripeMock.mock_webhook_event('invoice.payment_succeeded', subscription: sub.stripe_id, charge: charge.id)
 
       count = Payola::Sale.count
