saucy 0.14.1 → 0.14.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.14.2
+
+* Handle the case of nil billing_address
+
 0.14.1
 
 * Split up billing address form

data/app/controllers/billings_controller.rb

@@ -13,12 +13,14 @@ class BillingsController < ApplicationController
     @account.expiration_month = @account.credit_card.expiration_month
     @account.expiration_year = @account.credit_card.expiration_year
 
-    @account.street_address = @account.billing_address.street_address
-    @account.extended_address = @account.billing_address.extended_address
-    @account.locality = @account.billing_address.locality
-    @account.region = @account.billing_address.region
-    @account.postal_code = @account.billing_address.postal_code
-    @account.country_name = @account.billing_address.country_name
+    if @account.billing_address
+      @account.street_address = @account.billing_address.street_address
+      @account.extended_address = @account.billing_address.extended_address
+      @account.locality = @account.billing_address.locality
+      @account.region = @account.billing_address.region
+      @account.postal_code = @account.billing_address.postal_code
+      @account.country_name = @account.billing_address.country_name
+    end
   end
 
   def update

data/spec/controllers/billings_controller_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe BillingsController, "#edit", :as => :account_admin do
+  def assigned_account
+    subject.instance_variable_get("@account")
+  end
+
+  let(:stub_credit_card) do 
+    stub("credit card", {
+      :cardholder_name => "stub_cardholder_name",
+      :expiration_month => "stub_expiration_month",
+      :expiration_year => "stub_expiration_year",
+    })
+  end
+
+  let(:stub_customer) do
+    stub("customer", {
+      :email => "stub_email"
+    })
+  end
+
+  before do
+    account.stubs(:credit_card => stub_credit_card)
+    account.stubs(:customer => stub_customer)
+    Account.stubs(:find_by_keyword! => account)
+  end
+
+  context "for an account without a billing address" do
+    before do
+      account.stubs(:billing_address => nil)
+      get :edit, :account_id => account.keyword
+    end
+
+    it { should respond_with(:success) }
+  end
+
+  context "for an account with a billing address" do
+    let(:billing_address) do
+      stub("billing address", {
+        :street_address   => 'stub_street_address',
+        :extended_address => 'stub_extended_address',
+        :locality         => 'stub_locality',
+        :region           => 'stub_region',
+        :postal_code      => 'stub_postal_code',
+        :country_name     => 'stub_country_name'
+      })
+    end
+
+    before do
+      account.stubs(:billing_address => billing_address)
+      get :edit, :account_id => account.keyword
+    end
+
+    it { should respond_with(:success) }
+
+    it "should set billing address fields" do
+      assigned_account.street_address.should == 'stub_street_address'
+      assigned_account.extended_address.should == 'stub_extended_address'
+      assigned_account.locality.should == 'stub_locality'
+      assigned_account.region.should == 'stub_region'
+      assigned_account.postal_code.should == 'stub_postal_code'
+      assigned_account.country_name.should == 'stub_country_name'
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: saucy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
@@ -257,6 +257,7 @@ files:
 - spec/controllers/admin/base_controller_spec.rb
 - spec/controllers/admin/users_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
+- spec/controllers/billings_controller_spec.rb
 - spec/controllers/invitations_controller_spec.rb
 - spec/controllers/memberships_controller_spec.rb
 - spec/controllers/plans_controller_spec.rb
@@ -328,6 +329,7 @@ test_files:
 - spec/controllers/admin/base_controller_spec.rb
 - spec/controllers/admin/users_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
+- spec/controllers/billings_controller_spec.rb
 - spec/controllers/invitations_controller_spec.rb
 - spec/controllers/memberships_controller_spec.rb
 - spec/controllers/plans_controller_spec.rb