spree 0.10.2 → 0.11.0

data/test/functional/admin/products_controller_test.rb

@@ -46,7 +46,7 @@ class Admin::ProductsControllerTest < ActionController::TestCase
     context "and format = html" do
       setup do
         get :index, "search" => {
-            "name_contains" => "rails",
+            "name_contains" => "Rails",
             "order" => "ascend_by_name",
             "deleted_at_not_null" => ""}
       end
@@ -72,7 +72,7 @@ class Admin::ProductsControllerTest < ActionController::TestCase
       should "render sibebar search" do
         assert_select "div#sidebar" do
            assert_select "form[action='/admin/products']" do
-             assert_select "input[id='search_name_contains'][value=?]", "rails"
+             assert_select "input[id='search_name_contains'][value=?]", "Rails"
              assert_select "input[id='search_variants_including_master_sku_contains']"
              assert_select "input[id='search_deleted_at_not_null'][type='checkbox']"
              assert_select "button[type='submit']", :text => I18n.t('search')
@@ -88,7 +88,7 @@ class Admin::ProductsControllerTest < ActionController::TestCase
         get :index,
           "format" => "json",
           "search" => {
-            "name_contains" => "rails",
+            "name_contains" => "Rails",
             "order" => "ascend_by_name",
             "deleted_at_not_null" => ""}
 
@@ -145,8 +145,7 @@ class Admin::ProductsControllerTest < ActionController::TestCase
   context "on POST to :create" do
     setup do
       UserSession.create(Factory(:admin_user))
-      @tax_category = Factory.create(:tax_category)
-      Spree::Config.set :default_tax_category => @tax_category.name
+      @tax_category = Factory.create(:tax_category, :is_default => true)
 
       assert_difference "Product.count", 1 do
         post :create, :product => {

data/test/integration/checkout_test.rb

@@ -3,6 +3,7 @@ require 'test_helper'
 class CheckoutTest < ActionController::IntegrationTest
   context "Checkout" do                                  
     setup do 
+      Spree::Config.set(:allow_anonymous_checkout => false)
       @user = Factory(:admin_user, :password=>'test', :password_confirmation=>'test')
       @product = Factory(:product)
     end

data/test/test_helper.rb

@@ -1,111 +1,139 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-require "authlogic/test_case"
-require File.expand_path(File.dirname(__FILE__) + "/../vendor/extensions/payment_gateway/test/mocks/authorize_net_cim_mock")
-
-class ActiveSupport::TestCase
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
-  fixtures :all
-end
+require 'rubygems'
+require 'spork'
+
+Spork.prefork do
+  # Loading more in this block will cause your tests to run faster. However,
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+
+  ENV["RAILS_ENV"] = "test"
+  require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+  require 'test_help'
+  require "authlogic/test_case"
+  require File.expand_path(File.dirname(__FILE__) + "/../vendor/extensions/payment_gateway/test/mocks/authorize_net_cim_mock")
+
+  # BENCHMARK=[true|full] to use test_benchmark
+  require 'test_benchmark' if ENV["BENCHMARK"]
+
+  class ActiveSupport::TestCase
+    self.use_transactional_fixtures = true
+    self.use_instantiated_fixtures  = false
+    fixtures :all
+  end
 
-I18n.locale = "en-US"
-Spree::Config.set(:default_country_id => Country.first.id) if Country.first
+  I18n.locale = "en"
+  Spree::Config.set(:default_country_id => Country.first.id) if Country.first
 
-class ActionController::TestCase
-  setup :activate_authlogic
-end
+  class ActionController::TestCase
+    setup :activate_authlogic
+  end
 
-ActionController::TestCase.class_eval do
-  # special overload methods for "global"/nested params
-  [ :get, :post, :put, :delete ].each do |overloaded_method|
-    define_method overloaded_method do |*args|
-      action,params,extras = *args
-      super action, params || {}, *extras unless @params
-      super action, @params.merge( params || {} ), *extras if @params
+  ActionController::TestCase.class_eval do
+    # special overload methods for "global"/nested params
+    [ :get, :post, :put, :delete ].each do |overloaded_method|
+      define_method overloaded_method do |*args|
+        action,params,extras = *args
+        super action, params || {}, *extras unless @params
+        super action, @params.merge( params || {} ), *extras if @params
+      end
     end
   end
-end
-
-def setup
-  super
-  @params = {}
-end
 
-class TestCouponCalc
-  def self.calculate_discount(checkout)
-    0.99
+  def setup
+    super
+    @params = {}
   end
-end
 
-Zone.class_eval do
-  def self.global
-    find_by_name("GlobalZone") || Factory(:global_zone)
+  class TestCouponCalc
+    def self.calculate_discount(checkout)
+      0.99
+    end
   end
-end
 
-def create_complete_order
-  @zone = Zone.global
-  @order = Factory(:order)
-  3.times do
-    #variant = Factory(:product).variants.first
-    variant = Factory(:variant)
-    Factory(:line_item, :variant => variant, :order => @order)
+  Zone.class_eval do
+    def self.global
+      find_by_name("GlobalZone") || Factory(:global_zone)
+    end
   end
 
-  @shipping_method = Factory(:shipping_method)
-  @checkout = @order.checkout
+  def create_complete_order
+    @zone = Zone.global
+    @order = Factory(:order)
+    3.times do
+      #variant = Factory(:product).variants.first
+      variant = Factory(:variant)
+      Factory(:line_item, :variant => variant, :order => @order)
+    end
 
-  @checkout.ship_address = Factory(:address)
-  @checkout.shipping_method = @shipping_method
+    @shipping_method = Factory(:shipping_method)
+    @checkout = @order.checkout
 
-  @checkout.payments = [Factory(:payment, :amount => @order.total)]
-  @checkout.save
+    @checkout.ship_address = Factory(:address)
+    @checkout.shipping_method = @shipping_method
 
-  @shipment = @order.shipment
+    @checkout.payments = [Factory(:payment, :amount => @order.total)]
+    @checkout.save
 
-  @checkout.bill_address = Factory(:address)
+    @shipment = @order.shipment
 
-  unless @zone.include?(@order.shipment.address)
-    ZoneMember.create(:zone => Zone.global, :zoneable => @checkout.ship_address.country)
-    @zone.reload
-  end
+    @checkout.bill_address = Factory(:address)
 
-  @checkout.save
-  @shipment.save
-  @order.save
-  @order.reload
-  @order.save
-  @order
-end
+    unless @zone.include?(@order.shipment.address)
+      ZoneMember.create(:zone => Zone.global, :zoneable => @checkout.ship_address.country)
+      @zone.reload
+    end
+
+    @checkout.save
+    @shipment.save
+    @order.save
+    @order.reload
+    @order.save
+    @order
+  end
 
 # Sets up an order with state 'new' with completed checkout and authorized payment
-def create_new_order
-  create_complete_order
-  @checkout.next!
-  @checkout.next!
-  @checkout.creditcard_attributes = Factory.attributes_for(:creditcard)
-  @checkout.next!
-end
-    
-def create_new_order_v2
-  create_complete_order
-  @checkout.payments = [Factory(:payment)]
-  @checkout.state = "complete"
-  @checkout.save
-  @order.complete!
-end
+  def create_new_order
+    create_complete_order
+    @checkout.next!
+    @checkout.next!
+    @checkout.creditcard_attributes = Factory.attributes_for(:creditcard)
+    @checkout.next!
+  end
+
+  def create_new_order_v2
+    create_complete_order
+    @checkout.payments = [Factory(:payment)]
+    @checkout.state = "complete"
+    @checkout.save
+    @order.complete!
+  end
+  
+  def create_paid_order
+    create_complete_order
+    @order.payments = [Factory(:payment, :amount => @order.total, :payable => @order)]
+    until @order.checkout.complete?
+      @order.checkout.next!
+    end
+    @order.payments.first.finalize!
+    @order.reload
+    @order.pay!
+  end
 
 # useful method for functional tests that require an authenticated user
-def set_current_user
-  @user = Factory(:user)
-  @controller.stub!(:current_user, :return => @user)
-end
+  def set_current_user
+    @user = Factory(:user)
+    @controller.stub!(:current_user, :return => @user)
+  end
 
-def sort_list_hash(thing)
-  thing.map(&:sort).sort
+  def sort_list_hash(thing)
+    thing.map(&:sort).sort
+  end
+  def assert_equal_list_hash(alpha,beta)
+    assert_equal(sort_list_hash(alpha), sort_list_hash(beta))
+  end
 end
-def assert_equal_list_hash(alpha,beta)
-  assert_equal(sort_list_hash(alpha), sort_list_hash(beta))
+
+Spork.each_run do
+  # This code will be run each time you run your specs.
+
 end

data/test/unit/creditcard_test.rb

@@ -46,11 +46,12 @@ class CreditcardTest < ActiveSupport::TestCase
   
   context "authorization success" do
     setup do
-      create_complete_order
-      @payment = Factory(:payment)
-      @creditcard = @payment.source
-      @order.checkout.payments << @payment
+      @order = Order.create!
+      @order.line_items << Factory(:line_item,:order=>@order,:price=>100, :quantity=>1)
+      @order.update_totals
+      @payment = Factory(:payment, :payable=>@order, :amount=>100)
 
+      @creditcard = @payment.source
       @creditcard.authorize(100, @payment)
       @authorization = @creditcard.authorization(@payment)
     end
@@ -87,6 +88,23 @@ class CreditcardTest < ActiveSupport::TestCase
         assert_equal 0.00, @payment.amount.to_f
       end
     end
+    context "after cancelation and no inventory units in the shipment" do
+      setup do
+        @order.checkout.shipping_method = Factory(:shipping_method)
+        @order.complete!
+        @order.cancel!
+        @order.shipments.first.inventory_units.clear
+        @order.reload
+      end
+      context "followed by void" do
+        setup do
+          @creditcard.void(@payment)
+        end
+        should "update the payments" do
+          assert_equal 0.00, @order.payments.total.to_f
+        end
+      end
+    end
   end
   
   context "authorization failure" do
@@ -101,10 +119,13 @@ class CreditcardTest < ActiveSupport::TestCase
   
   context "purchase success" do
     setup do
-      create_complete_order
-      @payment = Factory(:payment)
+      @order = Order.create!
+      @order.line_items << Factory(:line_item,:order=>@order,:price=>100, :quantity=>1)
+      @order.checkout.shipping_method = Factory(:shipping_method)
+      @order.save!
+  
+      @payment = Factory(:payment, :payable=>@order, :amount=>100)
       @creditcard = @payment.source
-      @order.checkout.payments << @payment
       @creditcard.purchase(100, @payment)
     end
     should_change("CreditcardTxn.count", :by => 1) { CreditcardTxn.count }

data/test/unit/flexi_rate_calculator_test.rb

@@ -0,0 +1,75 @@
+require 'test_helper'
+
+class FlexiRateCalculatorTest < ActiveSupport::TestCase
+  context "Calculator::FlexiRate" do
+    [Coupon, ShippingMethod, ShippingRate].each do |calculable|
+      should "be available to #{calculable.to_s}" do
+       assert calculable.calculators.include?(Calculator::FlexiRate)
+      end
+    end
+    should "not be available to TaxRate" do
+      assert !TaxRate.calculators.include?(Calculator::FlexiRate)
+    end
+
+    context "#compute" do
+      setup do
+        @calculator = Calculator::FlexiRate.new(:preferred_first_item=>10, :preferred_additional_item=>5, :preferred_max_items=>3)
+        @order = Factory(:order)
+      end
+
+      should "compute 0 if no products" do
+        assert_equal(0, @calculator.compute(@order.line_items))
+      end
+
+      context "multiple qty=1 products" do
+        should "compute correctly for single item" do
+          @order.line_items << Factory(:line_item, :price => 1, :quantity => 1)
+          assert_equal(10, @calculator.compute(@order.line_items))
+        end
+        should "compute correctly for 1 additional item" do
+          @order.line_items << Factory(:line_item, :price => 1, :quantity => 1)
+          @order.line_items << Factory(:line_item, :price => 2, :quantity => 1)
+          assert_equal(15, @calculator.compute(@order.line_items))
+        end
+        should "compute correctly for 2 additional items (full package)" do
+          @order.line_items << Factory(:line_item, :price => 1, :quantity => 1)
+          @order.line_items << Factory(:line_item, :price => 2, :quantity => 1)
+          @order.line_items << Factory(:line_item, :price => 3, :quantity => 1)
+          assert_equal(20, @calculator.compute(@order.line_items))
+        end
+        should "compute correctly for 2 packages (1 full, 1 single item)" do
+          @order.line_items << Factory(:line_item, :price => 1, :quantity => 1)
+          @order.line_items << Factory(:line_item, :price => 2, :quantity => 1)
+          @order.line_items << Factory(:line_item, :price => 3, :quantity => 1)
+          @order.line_items << Factory(:line_item, :price => 4, :quantity => 1)
+          assert_equal(30, @calculator.compute(@order.line_items))
+        end
+      end
+      context "single product" do
+        should "compute correctly for qty=1" do
+          @order.line_items << Factory(:line_item, :price => 1, :quantity => 1)
+          assert_equal(10, @calculator.compute(@order.line_items))
+        end
+        should "compute correctly for qty=2 (1 additional)" do
+          @order.line_items << Factory(:line_item, :price => 2, :quantity => 2)
+          assert_equal(15, @calculator.compute(@order.line_items))
+        end
+        should "compute correctly for qty=3 (full package)" do
+          @order.line_items << Factory(:line_item, :price => 3, :quantity => 3)
+          assert_equal(20, @calculator.compute(@order.line_items))
+        end
+        should "compute correctly for qty=4 (2 packages)" do
+          @order.line_items << Factory(:line_item, :price => 4, :quantity => 4)
+          assert_equal(30, @calculator.compute(@order.line_items))
+        end
+      end
+      context "mix qty>1 & qty=1 products" do
+        should "compute correctly for qty=3 + qty=1 products (2 packages)" do
+          @order.line_items << Factory(:line_item, :price => 3, :quantity => 3)
+          @order.line_items << Factory(:line_item, :price => 1, :quantity => 1)
+          assert_equal(30, @calculator.compute(@order.line_items))
+        end
+      end
+    end
+  end
+end

data/test/unit/helpers/products_helper_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ProductsHelperTest < ActionView::TestCase
   context "format_price" do
     setup { @price = 100 }
-    should "format the price using $ when locale is en-US" do
+    should "format the price using $ when locale is en" do
       assert format_price(@price).include?("$100.00")
     end
     should "should include the '(inc. VAT)' text when options[:show_vat_text] => true" do
@@ -21,12 +21,12 @@ class ProductsHelperTest < ActionView::TestCase
         Spree::Config.set(:show_price_inc_vat => false)
         assert_equal "$100.00", format_price(@price)
       end
-    end    
-  end  
+    end
+  end
 =begin
   should "format the price using $ when locale is es" do
     I18n.locale = "es"
     assert_equal "100,00 €", format_price(@price)
-  end 
+  end
 =end
 end

data/test/unit/inventory_unit_test.rb

@@ -2,17 +2,51 @@ require 'test_helper'
 
 class InventoryUnitTest < ActiveSupport::TestCase
   context InventoryUnit do
-    setup do
-      line_item = Factory(:line_item, :quantity => 5)
-      @order = line_item.order.reload
-    end
     context "when sold" do
       setup do
+        line_item = Factory(:line_item, :quantity => 5)
+        @order = line_item.order.reload
         InventoryUnit.sell_units(@order)
       end
 
       should_change("InventoryUnit.count", :by => 5) { InventoryUnit.count }
+      context "when sold (again - b/c of unexpected error) " do
+        setup do
+          @order.state = "in_progress"
+          InventoryUnit.sell_units(@order)
+        end
+        should_not_change("InventoryUnit.count") { InventoryUnit.count }
+      end
+
+      context "and line_item quantity is increased" do
+        setup do
+          @line_item = @order.line_items[0]
+          @line_item.update_attribute(:quantity, @line_item.quantity + 1)
+          InventoryUnit.adjust_units(@order)
+        end
+
+        should_change("InventoryUnit.count", :from => 5, :to => 6) { InventoryUnit.count }
+      end
 
+      context "and line_item quantity is decreased" do
+        setup do
+          @line_item = @order.line_items[0]
+          @line_item.update_attribute(:quantity, @line_item.quantity - 1)
+          InventoryUnit.adjust_units(@order)
+        end
+
+        should_change("InventoryUnit.count", :from => 5, :to => 4) { InventoryUnit.count }
+      end
+
+      context "and a line_item is destroyed" do
+        setup do
+          @line_item = @order.line_items[0].destroy
+          @line_item.destroy
+          InventoryUnit.adjust_units(@order.reload)
+        end
+
+        should_change("InventoryUnit.count", :from => 5, :to => 0) { InventoryUnit.count }
+      end
     end
-  end   
+  end
 end