spree 0.10.2 → 0.11.0

data/test/unit/product_test.rb

@@ -154,6 +154,27 @@ class ProductTest < ActiveSupport::TestCase
     should "not have a product id" do
       assert @product.id.nil?
     end
+
+    context "when a default tax category is defined" do
+      setup do
+        @tax_category = Factory(:tax_category, :is_default => true)
+      end
+
+      should "return associated tax category" do
+        assert_equal @product.tax_category, TaxCategory.first
+      end
+
+      context "and produt has no tax category" do
+        setup do
+          @product.tax_category = nil
+          @product.save
+        end
+
+        should "return default tax category" do
+          assert_equal @product.tax_category, TaxCategory.find(:first, :conditions => {:is_default => true})
+        end
+      end
+    end
   end
 
   context "New Product instantiated with on_hand" do

data/test/unit/return_authorization_test.rb

@@ -2,10 +2,14 @@ require 'test_helper.rb'
 
 class ReturnAuthorizationTest < ActiveSupport::TestCase
   fixtures :payment_methods
-  
+  should "be authorized initially" do
+    assert ReturnAuthorization.new.authorized?
+  end
+
   context "ReturnAuthorization" do
     setup do
-      create_complete_order
+      @order = Order.create!
+      @order.line_items << [Factory(:line_item, :order=>@order),Factory(:line_item, :order=>@order)]
 
       #complete order / checkout
       @order.complete!
@@ -13,19 +17,12 @@ class ReturnAuthorizationTest < ActiveSupport::TestCase
 
       #@order.pay!
       @order.update_attribute(:state, 'paid')
-      
-      #force shipment to ready_to_ship
-      shipment = @order.shipment
-      shipment.ready!
 
       @order.reload
-      
-      @line_item = @order.line_items.first
-      @return_authorization = ReturnAuthorization.create(:order => @order, :amount => @line_item.total)
-    end
+      @order.shipment.reload #hack for the @order.shipment caching
 
-    should "be authorized initally" do
-      assert ReturnAuthorization.new.authorized?
+      @line_item = @order.line_items.first
+      @return_authorization = ReturnAuthorization.new(:order => @order, :amount => @line_item.total)
     end
 
     context "with an order that has no shipped units" do
@@ -34,69 +31,66 @@ class ReturnAuthorizationTest < ActiveSupport::TestCase
         assert_not_nil @return_authorization.errors.on(:order)
       end
     end
-    
+
     context "with an order that has shipped units" do
       setup do
-        @return_authorization.order.shipment.order.reload    
-        @shipment = @return_authorization.order.shipment
-    
         @return_authorization.order.shipment.ship!
         @return_authorization.order.reload
       end
-    
+
       should "be valid" do
         assert @return_authorization.valid?
         assert_nil @return_authorization.errors.on(:order)
       end
-    
+
       context "with no inventory_units" do
         should "not be receivable" do
           assert !@return_authorization.can_receive?
         end
       end
-      
+
       context "with inventory_units" do
         setup do
           @return_authorization.add_variant(@line_item.variant_id, @line_item.quantity)
           @return_authorization.inventory_units.reload
         end
-      
+
         should "be receivable" do
           assert @return_authorization.can_receive?
         end
-      
+
         should "increase inventory_units.size" do
           assert_equal @line_item.quantity, @return_authorization.inventory_units.size
         end
-        
+
         should "decrease order.returnable_units count for returned variant" do
           assert_equal nil, @return_authorization.order.returnable_units[@line_item.variant]
         end
-        
+
         should "change order state to awaiting_return" do
           assert_equal "awaiting_return", @return_authorization.order.state
         end
-        
+
         context "that have been recieved" do
           setup do
             ::ReturnAuthorizationCredit
             @return_authorization.receive!
             @return_authorization.order.reload
           end
-        
+
           should_change("@return_authorization.order.adjustments.size", :by => 1) { @return_authorization.order.adjustments.size }
           should_change("@return_authorization.order.credits.size", :by => 1) { @return_authorization.order.credits.size }
-        
+
           should "change state to received" do
             assert @return_authorization.received?
           end
-        
+
           should "change order state to credit_owed" do
             assert @return_authorization.order.credit_owed?
           end
         end
       end
-    
+
     end
 
   end

data/test/unit/shipment_test.rb

@@ -23,6 +23,18 @@ class ShipmentTest < ActiveSupport::TestCase
       assert_equal 1, @shipment.state_events.count
       assert_equal 'pending', @shipment.state_events.first.previous_state
     end
+    
+    context "with paid order" do
+      setup do
+        create_paid_order
+        @shipment = Factory(:shipment, :order => @order, :inventory_unit_ids => @order.inventory_unit_ids)
+        @shipment.inventory_units << Factory(:inventory_unit)
+        @shipment.save!
+      end
+      should "be ready_to_ship" do
+        assert @shipment.ready_to_ship?
+      end
+    end
 
     context "when shipped" do
       setup do
@@ -51,9 +63,8 @@ class ShipmentTest < ActiveSupport::TestCase
 
   context "manifest" do
     setup do
-      create_complete_order
+      @order = Order.create!
 
-      @order.line_items.clear
       @variant1 = Factory(:variant)
       @variant2 = Factory(:variant)
       Factory(:line_item, :variant => @variant1, :order => @order, :quantity => 2)
@@ -76,8 +87,7 @@ class ShipmentTest < ActiveSupport::TestCase
 
   context "line_items" do
     setup do
-      create_complete_order
-      @order.line_items.clear
+      @order = Order.create!
       @line_item1 = Factory(:line_item, :variant => Factory(:variant), :order => @order, :quantity => 2)
       @line_item2 = Factory(:line_item, :variant => Factory(:variant), :order => @order, :quantity => 3)
       @line_item3 = Factory(:line_item, :variant => Factory(:variant), :order => @order, :quantity => 4)
@@ -126,7 +136,9 @@ class ShipmentTest < ActiveSupport::TestCase
 
   context "recalculate_order after shipping_method change" do
     setup do
-      create_complete_order
+      @order = Order.create!
+      @order.line_items << Factory(:line_item, :order=>@order)
+      @order.checkout.shipping_method = Factory(:shipping_method)
       @order.complete!
 
       @new_shipping_method = Factory(:shipping_method)
@@ -134,10 +146,10 @@ class ShipmentTest < ActiveSupport::TestCase
       c.preferred_amount = 5.0
       c.save!
 
+      @shipment = @order.shipment
       @shipment.shipping_method = @new_shipping_method
+      @shipment.shipping_method.zone.stub!(:include?) {true}
       @shipment.save!
-      @shipment.reload
-
       @shipment.recalculate_order
     end
 

data/test/unit/variant_test.rb

@@ -6,26 +6,42 @@ class VariantTest < ActiveSupport::TestCase
     context "without inventory units" do
       setup { @variant = Variant.new }
       should "not have inventory units" do
-        assert 0, @variant.inventory_units.size
+        assert_equal 0, @variant.inventory_units.size
       end
       should "on_hand should be zero" do
-        assert 0, @variant.on_hand
+        assert_equal 0, @variant.on_hand
       end
       should "not be deleted" do
         assert !@variant.deleted?
       end
     end
 
-    context "with specified on_hand" do
-      setup { @variant = Variant.new(:on_hand => 5) }
-      should "have inventory units" do
-        assert 5, @variant.inventory_units.size
+    context "when tracking inventory levels" do
+      setup { Spree::Config.set(:track_inventory_levels => true) }
+
+      context "with specified on_hand" do
+        setup { @variant = Variant.new(:on_hand => 5) }
+        should "on_hand should match specified units" do
+          assert_equal 5, @variant.on_hand
+        end
+        should_not_change("InventoryUnit.count") { InventoryUnit.count }
       end
-      should "on_hand should match specified units" do
-        assert 5, @variant.on_hand
+    end
+
+    context "when not tracking inventory levels" do
+      setup { Spree::Config.set(:track_inventory_levels => false) }
+      teardown { Spree::Config.set(:track_inventory_levels => true) }
+      should "raise exception when setting on_hand" do
+        assert_raise RuntimeError do
+          @variant = Variant.new(:on_hand => 5)
+        end
+        assert_raise RuntimeError do
+          @variant = Variant.new()
+          @variant.on_hand = 5
+        end
       end
-      should_not_change("InventoryUnit.count") { InventoryUnit.count }
     end
+
   end
 
   context "Variant.create" do
@@ -54,25 +70,45 @@ class VariantTest < ActiveSupport::TestCase
       end
       should_not_change("InventoryUnit.count") { InventoryUnit.count }
     end
-    context "with specified inventory level" do
-      setup do
-        @variant = Variant.new(:on_hand => 3)
-        @product.variants << @variant
-        @product.save
-      end
-      teardown do
-        @variant.destroy
+    context "when tracking inventory levels" do
+      setup { Spree::Config.set(:track_inventory_levels => true) }
+
+      context "with specified inventory level" do
+        setup do
+          @variant = Variant.new(:on_hand => 3)
+          @product.variants << @variant
+          @product.save
+        end
+        teardown do
+          @variant.destroy
+        end
+        should "adjust inventory levels" do
+          assert_equal 3, @variant.on_hand
+          assert_equal 3, @variant.product.reload.count_on_hand
+        end
+
+        should_not_change("InventoryUnit.count") { InventoryUnit.count }
       end
-      should "adjust inventory levels" do
-        assert_equal 3, @variant.on_hand
-        assert_equal 3, @variant.product.reload.count_on_hand
+    end
+    context "when not tracking inventory levels" do
+      setup { Spree::Config.set(:track_inventory_levels => false) }
+      teardown { Spree::Config.set(:track_inventory_levels => true) }
+      should "raise exception when setting on_hand" do
+        assert_raise RuntimeError do
+          @variant = Variant.new(:on_hand => 5)
+        end
+        assert_raise RuntimeError do
+          @variant = Variant.new()
+          @variant.on_hand = 5
+        end
       end
-
-      should_not_change("InventoryUnit.count") { InventoryUnit.count }
     end
+
   end
-  context "Variant instance with 1 unit of inventory" do
+
+  context "Variant instance with 1 unit of inventory and when tracking inventory levels" do
     setup do
+      Spree::Config.set(:track_inventory_levels => true)
       @variant = Factory(:variant)
       @variant.on_hand = 1
     end
@@ -128,10 +164,50 @@ class VariantTest < ActiveSupport::TestCase
       should "return false for in_stock?" do
         assert !@variant.in_stock?
       end
-      should "return false for available?" do
+      should "return true for available?" do
+        assert @variant.available?
+      end
+    end
+  end
+
+  context "Variant instance when not tracking inventory levels" do
+    setup do
+      Spree::Config.set(:track_inventory_levels => false)
+      @variant = Factory(:variant)
+    end
+    teardown do
+      Spree::Config.set(:track_inventory_levels => true)
+      @variant.destroy
+    end
+    should "raise exception when setting on_hand" do
+      assert_raise RuntimeError do
+        @variant.on_hand = 5
+      end
+    end
+
+    context "when backordering is allowed" do
+      setup do
+        Spree::Config.set(:allow_backorders => true)
+      end
+      should "return true for in_stock?" do
+        assert @variant.in_stock?
+      end
+      should "return true for available?" do
+        assert @variant.available?
+      end
+    end
+
+    context "when backordering is disallowed" do
+      setup { Spree::Config.set(:allow_backorders => false) }
+      teardown { Spree::Config.set(:allow_backorders => true) }
+      should "return true for in_stock?" do
+        assert @variant.in_stock?
+      end
+      should "return true for available?" do
         assert @variant.available?
       end
     end
+
   end
 
   should 'be deleted if deleted_at is set' do

data/vendor/extensions/api/api_extension.rb

@@ -35,13 +35,13 @@ class ApiExtension < Spree::Extension
       
       def generate_api_key
         if object.generate_api_key!
-          flash[:notice] = t('api.key_generated')
+          self.notice = t('api.key_generated')
         end
         redirect_to edit_object_path
       end
       def clear_api_key
         if object.clear_api_key!
-          flash[:notice] = t('api.key_cleared')
+          self.notice = t('api.key_cleared')
         end
         redirect_to edit_object_path
       end

data/vendor/extensions/api/app/controllers/api/base_controller.rb

@@ -3,6 +3,7 @@ class Api::BaseController < Spree::BaseController
 
   def self.resource_controller_for_api
     resource_controller
+    skip_before_filter :verify_authenticity_token, :if => lambda { admin_token_passed_in_headers }
 
     index.response do |wants|
       wants.json { render :json => collection.to_json(collection_serialization_options) }
@@ -22,12 +23,19 @@ class Api::BaseController < Spree::BaseController
       failure.wants.json { render :json => object_errors.to_json, :status => 422 }
     end
 
+    define_method :admin_token_passed_in_headers do
+      token = request.headers['X-SpreeAPIKey']
+      return false unless token
+      @current_user = User.find_by_api_key(token)
+      @current_user.has_role? 'admin'
+    end
+
     define_method :end_of_association_chain do
       (parent? ? parent_association : model).scoped(:include  => eager_load_associations)
     end
 
     define_method :collection do
-      @collection = search.all(:limit => 100)
+      @collection ||= search.all(:limit => 100)
     end
   end
 
@@ -70,7 +78,7 @@ class Api::BaseController < Spree::BaseController
       @search.order ||= "descend_by_created_at"
       @search
     end
-  
+
     def collection_serialization_options
       {}
     end
@@ -78,13 +86,13 @@ class Api::BaseController < Spree::BaseController
     def object_serialization_options
       {}
     end
-  
+
     def eager_load_associations
       nil
     end
-    
+
     def object_errors
       {:errors => object.errors.full_messages}
     end
-  
-end
+
+end

data/vendor/extensions/api/app/controllers/api/countries_controller.rb

@@ -0,0 +1,4 @@
+class Api::CountriesController < Api::BaseController
+  resource_controller_for_api
+  actions :index, :show
+end