Don't set a stripe_customer_id in subscription factory by default

Now if a subscription has a stripe_customer_id present when it is
created it is treated differently - we attempt to look up and use
the existing Stripe customer. In our specs, we normally don't want this
to be the case. We only want a stripe_customer_id to be present when
testing the new functionality, or when we're dealing with a subscription
that's already active (eg. when updating it or cancelling it).

Stop setting the stripe_customer_id by default in the factory, and set
it explicitly when we expect it to be present.

Author: Nicholas Firth-McCoy

app/models/payola/subscription.rb

@@ -128,6 +128,8 @@ def redirector
     end
 
     def conditional_stripe_token
+      # Don't require a Stripe token if we're creating a subscription for an existing Stripe customer
+      return true if stripe_customer_id.present?
       return true if plan.nil?
       if (plan.amount > 0 )
         if plan.respond_to?(:trial_period_days) and (plan.trial_period_days.nil? or ( plan.trial_period_days and !(plan.trial_period_days > 0) ))

spec/controllers/payola/subscriptions_controller_spec.rb

@@ -97,7 +97,7 @@ module Payola
 
     describe '#destroy' do
       before :each do
-        @subscription = create(:subscription, :state => :active)
+        @subscription = create(:subscription, state: :active, stripe_customer_id: Stripe::Customer.create.id)
       end
       it "call Payola::CancelSubscription and redirect" do
         Payola::CancelSubscription.should_receive(:call)
@@ -124,7 +124,7 @@ module Payola
 
     describe '#change_plan' do
       before :each do
-        @subscription = create(:subscription, state: :active)
+        @subscription = create(:subscription, state: :active, stripe_customer_id: Stripe::Customer.create.id)
         @plan = create(:subscription_plan)
       end
 
@@ -158,7 +158,7 @@ module Payola
 
     describe '#change_quantity' do
       before :each do
-        @subscription = create(:subscription, state: :active)
+        @subscription = create(:subscription, state: :active, stripe_customer_id: Stripe::Customer.create.id)
         @plan = create(:subscription_plan)
       end
 
@@ -192,7 +192,7 @@ module Payola
 
     describe "#update_card" do
       before :each do
-        @subscription = create(:subscription, state: :active)
+        @subscription = create(:subscription, state: :active, stripe_customer_id: Stripe::Customer.create.id)
         @plan = create(:subscription_plan)
       end
 

spec/factories/payola_subscriptions.rb

@@ -8,7 +8,6 @@
     status "MyString"
     owner_type "Owner"
     owner_id 1
-    stripe_customer_id "MyString"
     cancel_at_period_end false
     current_period_start "2014-11-04 22:34:39"
     current_period_end "2014-11-04 22:34:39"