radiant-shop-extension 0.90.4 → 0.91.2

data/spec/lib/shop/tags/card_spec.rb

@@ -23,7 +23,7 @@ describe Shop::Tags::Card do
     context 'all cards' do
       it 'should output the card types' do
         tag = %{<r:form:card:type />}
-        exp = %{<select name="card[type]" id="card_type">
+        exp = %{<select name="credit_card[type]" id="credit_card_type">
 <option value="amex">American Express</option>
 <option value="diners">Diners Club</option>
 <option value="master">Master Card</option>
@@ -37,7 +37,7 @@ describe Shop::Tags::Card do
     context 'except amex and diners' do
       it 'should output all except amex and diners' do
         tag = %{<r:form:card:type except="amex,diners" />}
-        exp = %{<select name="card[type]" id="card_type">
+        exp = %{<select name="credit_card[type]" id="credit_card_type">
 <option value="master">Master Card</option>
 <option value="visa">Visa</option>
 </select>}
@@ -49,7 +49,7 @@ describe Shop::Tags::Card do
     context 'only amex and diners' do
       it 'should output all except amex' do
         tag = %{<r:form:card:type only="amex,diners" />}
-        exp = %{<select name="card[type]" id="card_type">
+        exp = %{<select name="credit_card[type]" id="credit_card_type">
 <option value="amex">American Express</option>
 <option value="diners">Diners Club</option>
 </select>}
@@ -62,7 +62,7 @@ describe Shop::Tags::Card do
   describe 'form:card:month' do
     it 'should output the card months' do
       tag = %{<r:form:card:month />}
-      exp = %{<select name="card[month]" id="card_month">
+      exp = %{<select name="credit_card[month]" id="credit_card_month">
 <option value="01">01 - January</option>
 <option value="02">02 - February</option>
 <option value="03">03 - March</option>
@@ -84,7 +84,7 @@ describe Shop::Tags::Card do
   describe 'form:card:year' do
     it 'should output the card years' do
       tag = %{<r:form:card:year />}
-      exp = %{<select name="card[year]" id="card_year">\n}
+      exp = %{<select name="credit_card[year]" id="credit_card_year">\n}
       (Time.new.year ... Time.new.year + 15).each do |year|
         exp << %{<option value="#{year}">#{year}</option>\n}
       end

data/spec/lib/shop/tags/helpers_spec.rb

@@ -392,21 +392,34 @@ describe Shop::Tags::Helpers do
   
   describe '#current_address' do
     before :each do
-      @address  = shop_addresses(:billing)
+      @address  = shop_billings(:order_billing)
       @tag.attr = { 'type' => 'billing' }
     end
     
-    context 'billing address already exists and billing type was requested' do
+    context 'billing address already exists' do
       before :each do
-        @tag.locals.address = @address
-        @tag.locals.address_type = 'billing'
+        @tag.locals.billing = @address
       end
-      it 'should return the existing address' do
+      it 'should return the existing billing' do
+        result = Shop::Tags::Helpers.current_address(@tag,'billing')
+        result.should == @address
+      end
+      it 'should return the existing billing if no type is sent' do
         result = Shop::Tags::Helpers.current_address(@tag)
         result.should == @address
       end
     end
     
+    context 'shipping address already exists' do
+      before :each do
+        @tag.locals.shipping = @address
+      end
+      it 'should return the existing address' do
+        result = Shop::Tags::Helpers.current_address(@tag,'shipping')
+        result.should == @address
+      end
+    end
+    
     context 'current_order exists and has billing' do
       before :each do
         @order = shop_orders(:one_item)
@@ -414,7 +427,7 @@ describe Shop::Tags::Helpers do
         @tag.locals.shop_order = @order
       end
       it 'should return the order billing address' do
-        result = Shop::Tags::Helpers.current_address(@tag)
+        result = Shop::Tags::Helpers.current_address(@tag,'billing')
         result.should == @address
       end
     end
@@ -424,14 +437,14 @@ describe Shop::Tags::Helpers do
         @order = shop_orders(:one_item)
       end
       it 'should return nil' do
-        result = Shop::Tags::Helpers.current_address(@tag)
+        result = Shop::Tags::Helpers.current_address(@tag,'billing')
         result.should be_nil
       end
     end
     
     context 'no order exists' do
       it 'should return nil' do
-        result = Shop::Tags::Helpers.current_address(@tag)
+        result = Shop::Tags::Helpers.current_address(@tag,'billing')
         result.should be_nil
       end
     end

data/spec/models/form_address_spec.rb

@@ -18,17 +18,17 @@ describe FormAddress do
         
         context 'both billing and shipping' do
           it 'should assign that address to the order billing and shipping' do
-            @data[:billing]   = { :id => shop_orders(:several_items).billing.id }
-            @data[:shipping]  = { :id => shop_orders(:several_items).shipping.id }
+            @data[:billing]   = shop_orders(:several_items).billing.attributes.reject{ |k,v| k == 'id' }
+            @data[:shipping]  = shop_orders(:several_items).shipping.attributes.reject{ |k,v| k == 'id' }
             
             @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
-            shop_orders(:one_item).billing.should  === shop_addresses(:billing)
-            shop_orders(:one_item).shipping.should === shop_addresses(:shipping)
+            shop_orders(:one_item).billing.attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }.should  == shop_billings(:order_billing).attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }
+            shop_orders(:one_item).shipping.attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }.should == shop_shippings(:order_shipping).attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }
             
-            result[:billing].should  === shop_addresses(:billing).id
-            result[:shipping].should === shop_addresses(:shipping).id
+            result[:billing].should  === shop_orders(:one_item).billing.id
+            result[:shipping].should === shop_orders(:one_item).shipping.id
           end
         end
         
@@ -41,53 +41,12 @@ describe FormAddress do
             @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
-            shop_orders(:one_item).billing.should  === shop_addresses(:billing)
-            shop_orders(:one_item).shipping.should === shop_addresses(:billing)
-            
-            result[:billing].should  === shop_addresses(:billing).id
-            result[:shipping].should === shop_addresses(:billing).id
+            shop_orders(:one_item).billing.attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }.should  === shop_billings(:order_billing).attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }
+            shop_orders(:one_item).shipping.attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }.should === shop_shippings(:order_shipping).attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }
           end
         end
       end
       
-      context 'sending ids without customer logged in' do
-        before :each do
-          @order = shop_orders(:one_item)
-          mock_valid_form_address_request
-        end
-        context 'both billing and shipping' do
-          it 'it should not assign those addresses' do
-            @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
-            result = @address.create
-            
-            shop_orders(:one_item).billing.should  be_nil
-            shop_orders(:one_item).shipping.should be_nil
-            
-            result[:billing].should  === false
-            result[:shipping].should === false
-          end
-        end
-      end
-      
-      context 'sending ids as a bad customer' do
-        before :each do
-          login_as :bad_customer
-          
-          @order = shop_orders(:one_item)
-          mock_valid_form_address_request
-        end
-        it 'should not assign those addresses' do
-          @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
-          result = @address.create
-          
-          shop_orders(:one_item).billing.should  be_nil
-          shop_orders(:one_item).shipping.should be_nil
-          
-          result[:billing].should  === false
-          result[:shipping].should === false
-        end
-      end
-      
       context 'updating existing addresses' do
         before :each do
           login_as :customer
@@ -101,11 +60,8 @@ describe FormAddress do
           @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
           result = @address.create
           
-          shop_addresses(:billing).name.should  === 'new billing'
-          shop_addresses(:shipping).name.should === 'new shipping'
-          
-          result[:billing].should  === shop_addresses(:billing).id
-          result[:shipping].should === shop_addresses(:shipping).id
+          shop_billings(:order_billing).name.should  === 'new billing'
+          shop_shippings(:order_shipping).name.should === 'new shipping'
         end
       end
           
@@ -154,7 +110,7 @@ describe FormAddress do
             @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
-            shop_orders(:one_item).shipping.should      === shop_orders(:one_item).billing
+            shop_orders(:one_item).shipping.attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }.should === shop_orders(:one_item).billing.attributes.reject{ |k,v| k == 'id' || k = 'addressable_id' }
             
             result[:billing].should  === shop_orders(:one_item).billing.id
             result[:shipping].should === shop_orders(:one_item).shipping.id

data/spec/models/form_checkout_spec.rb

@@ -33,7 +33,7 @@ describe FormCheckout do
           result[:gateway].should be_true
           result[:card].should    be_true
           result[:payment].should be_true
-          result[:message].should === "Order successfully processed"
+          result[:message].should === "Bogus Gateway: Forced success"
         end
         
         it 'should assign a payment object' do
@@ -42,7 +42,7 @@ describe FormCheckout do
           result = @checkout.create
           
           @order.payment.card_number.should === "XXXX-XXXX-XXXX-1"
-          @order.payment.card_type.should   === @data[:card][:type]
+          @order.payment.card_type.should   === @data[:credit_card][:type]
           @order.payment.amount.should      === @order.price
         end
         
@@ -96,7 +96,7 @@ describe FormCheckout do
         
         context 'no card' do
           it 'should return card and payment false' do
-            @data[:card] = nil
+            @data[:credit_card] = nil
             
             @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
             result = @checkout.create

data/spec/models/shop_address_spec.rb

@@ -3,77 +3,63 @@ require File.dirname(__FILE__) + "/../spec_helper"
 describe ShopAddress do
   
   dataset :shop_addresses, :shop_orders
-
-  describe 'relationships' do
-    before :each do
-      @address = shop_addresses(:billing)
-    end
-    
-    context 'billing orders' do
-      before :each do
-        @order = shop_orders(:empty)
-      end
-      it 'should have many' do
-        @address.billings << @order
-        @address.billings.include?(@order).should === true
-      end
-    end
-    
-    context 'shipping orders' do
-      before :each do
-        @order = shop_orders(:empty)
-      end
-      it 'should have many' do
-        @address.shippings << @order
-        @address.shippings.include?(@order).should === true
-      end
-    end
-  end
   
   describe 'validations' do
     before :each do
-      @address = shop_addresses(:billing)
+      @address = shop_billings(:order_billing)
     end
     context 'unit' do
       it 'should not require' do
         @address.unit = nil
-        @address.valid?.should === true
+        @address.valid?.should be_true
       end
     end
     context 'name' do
       it 'should require' do
         @address.name = nil
-        @address.valid?.should === false
+        @address.valid?.should be_false
       end
     end
-    context 'street' do
+    context 'street_1' do
       it 'should require' do
-        @address.street = nil
-        @address.valid?.should === false        
+        @address.street_1 = nil
+        @address.valid?.should be_false
+      end
+    end
+    context 'street_2' do
+      it 'should not require' do
+        @address.street_2 = nil
+        @address.valid?.should be_true
       end
     end
     context 'city' do
       it 'should require' do
         @address.city = nil
-        @address.valid?.should === false        
+        @address.valid?.should be_false
       end
     end
     context 'postcode' do
       it 'should require' do
         @address.postcode = nil
-        @address.valid?.should === false        
+        @address.valid?.should be_false
       end
     end
     context 'state' do
       it 'should require' do
         @address.state = nil
-        @address.valid?.should === false        
+        @address.valid?.should be_false
       end
     end
     context 'country' do
       it 'should require' do
         @address.country = nil
-        @address.valid?.should === false        
+        @address.valid?.should be_false
+      end
+    end
+    context 'phone' do
+      it 'should not require' do
+        @address.phone = nil
+        @address.valid?.should be_true
       end
     end
   end

data/spec/models/shop_billing_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe ShopBilling do
+  
+  dataset :shop_addresses, :shop_orders
+  
+  describe 'scope' do
+    before :each do
+      @address = ShopBilling.new
+    end
+    
+    it 'should have a of_type of billing' do
+      @address.of_type.should == 'billing'
+    end
+    
+  end
+  
+  describe 'validations' do
+    before :each do
+      @address = shop_billings(:order_billing)
+    end
+    context 'email' do
+      it 'should require' do
+        @address.email = nil
+        @address.valid?.should be_false
+      end
+    end
+  end
+  
+end

data/spec/models/shop_customer_spec.rb

@@ -24,6 +24,7 @@ describe ShopCustomer do
         @order = shop_orders(:several_items)
       end
       it 'should have many through orders' do
+        pending
         @customer.orders << @order
         @customer.billings.include?(@order.billing).should === true
       end
@@ -34,6 +35,7 @@ describe ShopCustomer do
         @order = shop_orders(:several_items)
       end
       it 'should have many through orders' do
+        pending
         @customer.orders << @order
         @customer.shippings.include?(@order.shipping).should === true
       end

data/spec/models/shop_shipping_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe ShopShipping do
+  
+  dataset :shop_addresses, :shop_orders
+  
+  describe 'scope' do
+    before :each do
+      @address = ShopShipping.new
+    end
+    
+    it 'should have a of_type of shipping' do
+      @address.of_type.should == 'shipping'
+    end
+    
+  end
+  
+  describe 'validations' do
+    before :each do
+      @address = shop_shippings(:order_shipping)
+    end
+    context 'email' do
+      it 'should not require' do
+        @address.email = nil
+        @address.valid?.should be_true
+      end
+    end
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 383
+  hash: 375
   prerelease: false
   segments: 
   - 0
-  - 90
-  - 4
-  version: 0.90.4
+  - 91
+  - 2
+  version: 0.91.2
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +08:00
+date: 2010-12-08 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,6 +191,7 @@ files:
 - app/models/form_checkout.rb
 - app/models/form_line_item.rb
 - app/models/shop_address.rb
+- app/models/shop_billing.rb
 - app/models/shop_category.rb
 - app/models/shop_category_page.rb
 - app/models/shop_customer.rb
@@ -201,6 +202,7 @@ files:
 - app/models/shop_product.rb
 - app/models/shop_product_attachment.rb
 - app/models/shop_product_page.rb
+- app/models/shop_shipping.rb
 - app/views/.DS_Store
 - app/views/admin/.DS_Store
 - app/views/admin/shop/categories/edit.html.haml
@@ -295,6 +297,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20101011063133_setup_shop.rb
+- db/migrate/20101208045754_address_changes.rb
 - db/seed.rb
 - db/seeds/forms.rb
 - db/seeds/layouts.rb
@@ -367,6 +370,7 @@ files:
 - spec/models/form_address_spec.rb
 - spec/models/form_checkout_spec.rb
 - spec/models/shop_address_spec.rb
+- spec/models/shop_billing_spec.rb
 - spec/models/shop_category_page_spec.rb
 - spec/models/shop_category_spec.rb
 - spec/models/shop_customer_spec.rb
@@ -376,6 +380,7 @@ files:
 - spec/models/shop_product_attachment_spec.rb
 - spec/models/shop_product_page_spec.rb
 - spec/models/shop_product_spec.rb
+- spec/models/shop_shipping_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -447,6 +452,7 @@ test_files:
 - spec/models/form_address_spec.rb
 - spec/models/form_checkout_spec.rb
 - spec/models/shop_address_spec.rb
+- spec/models/shop_billing_spec.rb
 - spec/models/shop_category_page_spec.rb
 - spec/models/shop_category_spec.rb
 - spec/models/shop_customer_spec.rb
@@ -456,4 +462,5 @@ test_files:
 - spec/models/shop_product_attachment_spec.rb
 - spec/models/shop_product_page_spec.rb
 - spec/models/shop_product_spec.rb
+- spec/models/shop_shipping_spec.rb
 - spec/spec_helper.rb