spree 0.6.0 → 0.7.0

data/spec/controllers/countries_controller_spec.rb

@@ -11,8 +11,9 @@ describe CountriesController do
   it "should include AuthenticatedSystem" do
     controller.class.included_modules.should include(AuthenticatedSystem)
   end
-=begin
-  it "should not allow deletion of a county from a default rails route" do
+  it "should not allow deletion of a county from a default rails route" 
+=begin  
+  do
     lambda {
       get :destroy, :id => countries(:united_states).id
     }.should raise_error(ActionController::RoutingError)

data/spec/controllers/orders_controller_spec.rb

@@ -3,18 +3,20 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe OrdersController do
   before(:each) do
     Variant.stub!(:find).with(any_args).and_return(@variant = mock_model(Variant, :price => 10, :on_hand => 50))
-    controller.stub!(:find_order).and_return(@order = Order.new)
+    @order = Order.new
+    @order.stub!(:number).and_return("R100")
+    controller.stub!(:find_order).and_return(@order)
   end
 
   describe "create" do
     it "should add the variant to the order" do
-      @order.should_receive(:add_variant).with(@variant)
-      post :create, :id => "345", :variant => "id[123]"
+      @order.should_receive(:add_variant).with(@variant,2)
+	post :create, :id => "345", :quantities => {456 => "123=2"}
     end
   
     it "should not set the state" do
       @order.should_not_receive(:state=)
-      post :create, :id => "345", :variant => "id[123]", :order => {:state => "paid"}
+      post :create, :id => "345", :quantities => {456 => "123=1"}, :order => {:state => "paid"}
     end    
   end
   
@@ -27,4 +29,4 @@ describe OrdersController do
       end
     end
   end
-end
+end

data/spec/controllers/states_controller_spec.rb

@@ -6,8 +6,10 @@ describe StatesController do
   it "should include AuthenticatedSystem" do
     controller.class.included_modules.should include(AuthenticatedSystem)
   end
-=begin
-  it "should not allow deletion of a state from a default rails route" do
+
+  it "should not allow deletion of a state from a default rails route" 
+=begin  
+  do
     lambda {
       get :destroy, :id => states(:new_york).id
     }.should raise_error(ActionController::RoutingError)

data/spec/models/creditcard_payment_spec.rb

@@ -2,12 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe CreditcardPayment do
   before(:each) {@creditcard_payment = CreditcardPayment.create(:order => Order.new)}
-  it "#can_capture? should return true if the last transaction was an authorization" do
+  it "#can_capture? should return false if there is no response code" do
     @creditcard_payment.txns.create(:txn_type => CreditcardTxn::TxnType::AUTHORIZE)
+    @creditcard_payment.can_capture?.should == false
+  end
+  it "#can_capture? should return true if the last transaction was an authorization" do
+    @creditcard_payment.txns.create(:txn_type => CreditcardTxn::TxnType::AUTHORIZE, :response_code => "123")
     @creditcard_payment.can_capture?.should == true
   end
   it "#can_capture? should return false if the last transaction is not an authorization" do
-    @creditcard_payment.txns.create(:txn_type => CreditcardTxn::TxnType::CAPTURE)
+    @creditcard_payment.txns.create(:txn_type => CreditcardTxn::TxnType::CAPTURE, :response_code => "123")
     @creditcard_payment.can_capture?.should == false    
   end
 end

data/spec/models/order_spec.rb

@@ -1,158 +1,165 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
-
-describe Order do
-  before(:each) do
-    @variant = Variant.new(:id => "1234", :price => 7.99)
-    @inventory_unit = mock_model(InventoryUnit, :null_object => true)
-    @creditcard_payment = mock_model(CreditcardPayment, :null_object => true)
-    @user = mock_model(User, :email => "foo@exampl.com")
-
-    @order = Order.new
-    @order.checkout_complete = true
-    @order.creditcard_payments = [@creditcard_payment]
-    @order.number = '#TEST1010'
-    @order.user =  @user
-
-    @order.stub!(:save => true, :inventory_units => [@inventory_unit])
-    @line_item =  LineItem.new(:variant => @variant, :quantity => 1, :price => 7.99)
-    @order.line_items << @line_item
-    InventoryUnit.stub!(:retrieve_on_hand).with(@variant, 1).and_return [@inventory_unit]
-    OrderMailer.stub!(:deliver_confirm).with(any_args)   
-    OrderMailer.stub!(:deliver_cancel).with(any_args)    
-
-  end
-
-  describe "create" do
-    it "should generate an order number"
-  end
-  
-  describe "next" do
-    describe "from creditcard_payment" do
-      before(:each) do
-        @order.state = 'creditcard'
-      end
-      it "should transition to new" do
-        @order.next
-        @order.state.should == "new"
-      end
-      it "should mark inventory as sold" do
-        @inventory_unit.should_receive(:sell!)
-        @order.next
-      end
-      it "should send a confirmation email" do
-        OrderMailer.should_receive(:deliver_confirm).with(@order)
-        @order.next
-      end
-    end
-  end
-    
-  describe "cancel" do
-    it "should mark inventory as on_hand" do
-      @order.state = "captured"
-      @inventory_unit.stub!(:state).and_return('sold')
-      @inventory_unit.should_receive(:restock!)
-      @order.cancel
-    end
-    it "should send a cancellation email" do
-      OrderMailer.should_receive(:deliver_cancel).with(@order)
-      @order.cancel
-    end
-  end
-  
-  describe "return" do
-    it "should mark inventory as on_hand" do
-      @order.state = "shipped"
-      @inventory_unit.stub!(:state).and_return('shipped')
-      @inventory_unit.should_receive(:restock!)
-      @order.return
-    end
-  end
-  
-  describe "add_variant" do
-    it "should add new line item if product does not currently existing in order" do
-      @variant2 = mock_model(Variant, :id => "5678", :price => 9.99)
-      
-      @order.line_items.should_receive(:in_order).with(@variant2).and_return(nil)
-      @order.line_items.size.should == 1
-
-      @order.add_variant(@variant2)
-      
-      @order.line_items.size.should == 2
-    end
-    
-    it "should increment the quantity of line_item by 1 when product already exists in order, and no specific quantity is supplied" do
-
-      @order.line_items.should_receive(:in_order).with(@variant).and_return(@line_item)
-      @line_item.should_receive(:save).and_return(true)
-      
-      @order.line_items[0].quantity.should == 1
-      @order.add_variant(@variant)
-    
-      @order.line_items[0].quantity.should == 2
-    end
-    
-    it "should increment the quantity of line_item by x when product already exists in order, and a specific quantity is supplied"do
-
-      @order.line_items.should_receive(:in_order).with(@variant).and_return(@line_item)
-      @line_item.should_receive(:save).and_return(true)
-      
-      @order.line_items[0].quantity.should == 1
-      @order.add_variant(@variant, 5)
-    
-      @order.line_items[0].quantity.should == 6
-    end
-    
-    it "should populate additional fields on line_item when additional_fields is present" do
-        Variant.stub!(:additional_fields).and_return([
-          {:name => 'Weight', :only => [:product]},
-          {:name => 'Height', :only => [:product, :variant], :format => "%.2f"},
-          {:name => 'Width', :only => [:variant], :format => "%.2f", :populate => [:line_item]},
-          {:name => 'Depth', :only => [:variant], :populate => [:line_item]}
-        ])
-        
-        #build / mock second line item to be returned, when we add the new variant
-        @line_item2 =  LineItem.new(:variant => @variant, :quantity => 1)
-        @line_item2.should_receive(:save).exactly(3).times.and_return(true)
-        @line_item2.stub!(:width=) 
-        @line_item2.stub!(:depth=)
-        
-        #mock new variant to add to order
-        @variant2 = mock_model(Variant, :id => "5678", :price => 9.99, :width => 19, :depth => 79)
-        
-        #this is what we expect to happen
-        @order.line_items.should_receive(:in_order).with(@variant2).and_return(@line_item2)
-        @line_item2.should_receive(:width=).with(@variant2.width) 
-        @line_item2.should_receive(:depth=).with(@variant2.depth)
-          
-        @order.add_variant(@variant2)
-        
- 
-    end
-  end
-
-  describe "resume" do
-    %w{in_progress shipment shipping_method creditcard charged }.each do |state|
-      it "should not be available in #{state} state" do 
-        @order.state = state
-        @order.send("can_resume?").should == false
-      end
-    end
-    it "should be available in canceled state" do 
-      @order.state = 'canceled'
-      @order.state_events = [StateEvent.new(:name => 'cancel', :previous_state => 'charged')]
-      @order.send("can_resume?").should == true
-    end
-    it "should restore the order to the previous state" do
-      @order.state_events = [StateEvent.new(:name => 'cancel', :previous_state => 'charged')]
-      @order.state = 'canceled'
-      @order.resume!
-      @order.state.should == 'charged'
-    end
-    it "should not be available for legacy orders wtih no prior state information" do 
-      @order.state = 'canceled'
-      @order.state_events = [StateEvent.new(:name => 'cancel')]
-      @order.send("can_resume?").should == false
-    end
-  end
-
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe Order do
+  before(:each) do
+    @variant = Variant.new(:id => "1234", :price => 7.99)
+    @inventory_unit = mock_model(InventoryUnit, :null_object => true)
+    @creditcard_payment = mock_model(CreditcardPayment, :null_object => true)
+    @user = mock_model(User, :email => "foo@exampl.com")
+
+    @order = Order.new
+    @order.checkout_complete = true
+    @order.creditcard_payments = [@creditcard_payment]
+    @order.number = '#TEST1010'
+    @order.user =  @user
+
+    @order.stub!(:save => true, :inventory_units => [@inventory_unit])
+    @line_item =  LineItem.new(:variant => @variant, :quantity => 1, :price => 7.99)
+    @order.line_items << @line_item
+    InventoryUnit.stub!(:retrieve_on_hand).with(@variant, 1).and_return [@inventory_unit]
+    OrderMailer.stub!(:deliver_confirm).with(any_args)   
+    OrderMailer.stub!(:deliver_cancel).with(any_args)    
+
+  end
+
+  describe "create" do
+    it "should generate an order number"
+  end
+  
+  describe "next" do
+    describe "from creditcard_payment" do
+      before(:each) do
+        @order.state = 'creditcard'
+      end
+      it "should transition to new" do
+        @order.next
+        @order.state.should == "new"
+      end
+      it "should mark inventory as sold" do
+        @inventory_unit.should_receive(:sell!)
+        @order.next
+      end
+      it "should send a confirmation email" do
+        OrderMailer.should_receive(:deliver_confirm).with(@order)
+        @order.next
+      end
+    end
+  end
+    
+  describe "cancel" do
+    it "should mark inventory as on_hand" do
+      @order.state = "captured"
+      @inventory_unit.stub!(:state).and_return('sold')
+      @inventory_unit.should_receive(:restock!)
+      @order.cancel
+    end
+    it "should send a cancellation email" do
+      OrderMailer.should_receive(:deliver_cancel).with(@order)
+      @order.cancel
+    end                        
+    %w{in_progress creditcard}.each do |state|
+      it "should be available in the #{state} state" do
+        @order.state = state
+        @order.checkout_complete = false
+        @order.can_cancel?.should be_true
+      end
+    end
+  end
+  
+  describe "return" do
+    it "should mark inventory as on_hand" do
+      @order.state = "shipped"
+      @inventory_unit.stub!(:state).and_return('shipped')
+      @inventory_unit.should_receive(:restock!)
+      @order.return
+    end
+  end
+  
+  describe "add_variant" do
+    it "should add new line item if product does not currently existing in order" do
+      @variant2 = mock_model(Variant, :id => "5678", :price => 9.99)
+      
+      @order.line_items.should_receive(:in_order).with(@variant2).and_return(nil)
+      @order.line_items.size.should == 1
+
+      @order.add_variant(@variant2)
+      
+      @order.line_items.size.should == 2
+    end
+    
+    it "should increment the quantity of line_item by 1 when product already exists in order, and no specific quantity is supplied" do
+
+      @order.line_items.should_receive(:in_order).with(@variant).and_return(@line_item)
+      @line_item.should_receive(:save).and_return(true)
+      
+      @order.line_items[0].quantity.should == 1
+      @order.add_variant(@variant)
+    
+      @order.line_items[0].quantity.should == 2
+    end
+    
+    it "should increment the quantity of line_item by x when product already exists in order, and a specific quantity is supplied"do
+
+      @order.line_items.should_receive(:in_order).with(@variant).and_return(@line_item)
+      @line_item.should_receive(:save).and_return(true)
+      
+      @order.line_items[0].quantity.should == 1
+      @order.add_variant(@variant, 5)
+    
+      @order.line_items[0].quantity.should == 6
+    end
+    
+    it "should populate additional fields on line_item when additional_fields is present" do
+        Variant.stub!(:additional_fields).and_return([
+          {:name => 'Weight', :only => [:product]},
+          {:name => 'Height', :only => [:product, :variant], :format => "%.2f"},
+          {:name => 'Width', :only => [:variant], :format => "%.2f", :populate => [:line_item]},
+          {:name => 'Depth', :only => [:variant], :populate => [:line_item]}
+        ])
+        
+        #build / mock second line item to be returned, when we add the new variant
+        @line_item2 =  LineItem.new(:variant => @variant, :quantity => 1)
+        @line_item2.should_receive(:save).exactly(3).times.and_return(true)
+        @line_item2.stub!(:width=) 
+        @line_item2.stub!(:depth=)
+        
+        #mock new variant to add to order
+        @variant2 = mock_model(Variant, :id => "5678", :price => 9.99, :width => 19, :depth => 79)
+        
+        #this is what we expect to happen
+        @order.line_items.should_receive(:in_order).with(@variant2).and_return(@line_item2)
+        @line_item2.should_receive(:width=).with(@variant2.width) 
+        @line_item2.should_receive(:depth=).with(@variant2.depth)
+          
+        @order.add_variant(@variant2)
+        
+ 
+    end
+  end
+
+  describe "resume" do
+    %w{in_progress shipment shipping_method creditcard charged }.each do |state|
+      it "should not be available in #{state} state" do 
+        @order.state = state
+        @order.send("can_resume?").should == false
+      end
+    end
+    it "should be available in canceled state" do 
+      @order.state = 'canceled'
+      @order.state_events = [StateEvent.new(:name => 'cancel', :previous_state => 'charged')]
+      @order.send("can_resume?").should == true
+    end
+    it "should restore the order to the previous state" do
+      @order.state_events = [StateEvent.new(:name => 'cancel', :previous_state => 'charged')]
+      @order.state = 'canceled'
+      @order.resume!
+      @order.state.should == 'charged'
+    end
+    it "should not be available for legacy orders wtih no prior state information" do 
+      @order.state = 'canceled'
+      @order.state_events = [StateEvent.new(:name => 'cancel')]
+      @order.send("can_resume?").should == false
+    end
+  end
+
 end

data/spec/models/product_spec.rb

@@ -83,8 +83,8 @@ describe Product do
   end
 
   describe "permalinks" do
-    before(:each) do
-      @product.name = "Air force ones"
+    before(:each) do 
+      @product = Product.new(:name => "Air force ones", :description => "Whatever", :master_price => 10.00)
     end
 
     it "should not have a nil permalink with a saved name" do

data/vendor/extensions/payment_gateway/db/migrate/20090218091936_create_protx_gateway.rb

@@ -0,0 +1,18 @@
+class CreateProtxGateway < ActiveRecord::Migration
+  def self.up
+    protx = Gateway.create(
+      :clazz => 'ActiveMerchant::Billing::ProtxGateway',
+      :name => 'Protx',
+      :description => "Active Merchant's Protx Gateway (IE/UK)" 
+    ) 
+
+    GatewayOption.create(:name => 'login', :description => 'Your Protx Login', :gateway_id => protx.id, :textarea => false)
+    GatewayOption.create(:name => 'password', :description => 'Your Protx Password', :gateway_id => protx.id, :textarea => false)
+    GatewayOption.create(:name => 'account', :description => 'Protx sub account name (optional)', :gateway_id => protx.id, :textarea => false)
+  end
+
+  def self.down
+    protx = Gateway.find_by_name('Protx')
+    protx.destroy
+  end
+end

data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb

@@ -7,7 +7,7 @@ module Spree
       gateway_error(response) unless response.success?
       
       # create a creditcard_payment for the amount that was authorized
-      creditcard_payment = order.creditcard_payments.create(:amount => amount, :creditcard => self)
+      creditcard_payment = order.creditcard_payments.create(:amount => 0, :creditcard => self)
       # create a transaction to reflect the authorization
       creditcard_payment.creditcard_txns << CreditcardTxn.new(
         :amount => amount,
@@ -51,14 +51,16 @@ module Spree
     end
     
     def gateway_error(response)
-      text = response.params['message'] || response.params['response_reason_text']      
-      msg = "#{t('gateway_error')} ... #{text}"
+      text = response.params['message'] || 
+             response.params['response_reason_text'] ||
+             response.message
+      msg = "#{I18n.t('gateway_error')} ... #{text}"
       logger.error(msg)
       raise Spree::GatewayError.new(msg)
     end
         
     def gateway_options
-      options = {:billing_address => generate_address_hash(order.bill_address), 
+      options = {:billing_address => generate_address_hash(address), 
                  :shipping_address => generate_address_hash(order.ship_address)}
       options.merge minimal_gateway_options
     end    
@@ -99,4 +101,4 @@ module Spree
       return gateway
     end  
   end
-end
+end