spree_core 3.0.10 → 3.1.0.rc1

data/spec/models/spree/adjustment_spec.rb

@@ -8,11 +8,37 @@ describe Spree::Adjustment, :type => :model do
   let(:order) { Spree::Order.new }
 
   before do
-    allow(order).to receive(:update!)
+    allow(order).to receive(:update_with_updater!)
   end
 
   let(:adjustment) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: order, order: order, amount: 5) }
 
+  describe 'scopes' do
+    describe '.for_complete_order' do
+      let(:complete_order) { Spree::Order.create! completed_at: Time.current }
+      let(:incomplete_order) { Spree::Order.create! completed_at: nil }
+      let(:adjustment_for_complete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: complete_order, order: complete_order, amount: 5) }
+      let(:adjustment_for_incomplete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: incomplete_order, order: incomplete_order, amount: 5) }
+
+      subject { Spree::Adjustment.for_complete_order }
+
+      it { is_expected.to include(adjustment_for_complete_order) }
+      it { is_expected.to_not include(adjustment_for_incomplete_order) }
+    end
+
+    describe '.for_incomplete_order' do
+      let(:complete_order) { Spree::Order.create! completed_at: Time.current }
+      let(:incomplete_order) { Spree::Order.create! completed_at: nil }
+      let(:adjustment_for_complete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: complete_order, order: complete_order, amount: 5) }
+      let(:adjustment_for_incomplete_order) { Spree::Adjustment.create!(label: 'Adjustment', adjustable: incomplete_order, order: incomplete_order, amount: 5) }
+
+      subject { Spree::Adjustment.for_incomplete_order }
+
+      it { is_expected.to_not include(adjustment_for_complete_order) }
+      it { is_expected.to include(adjustment_for_incomplete_order) }
+    end
+  end
+
   context '#create & #destroy' do
     let(:adjustment) { Spree::Adjustment.new(label: "Adjustment", amount: 5, order: order, adjustable: create(:line_item)) }
 

data/spec/models/spree/app_configuration_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Spree::AppConfiguration, :type => :model do
-
   let (:prefs) { Rails.application.config.spree.preferences }
 
   it "should be available from the environment" do
@@ -19,5 +18,9 @@ describe Spree::AppConfiguration, :type => :model do
     expect(prefs.searcher_class).to eq Spree::Core::Search::Base
   end
 
+  describe 'admin_path' do
+    it { expect(Spree::Config).to have_preference(:admin_path) }
+    it { expect(Spree::Config.preferred_admin_path_type).to eq(:string) }
+    it { expect(Spree::Config.preferred_admin_path_default).to eq('/admin') }
+  end
 end
-

data/spec/models/spree/calculator/default_tax_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
-describe Spree::Calculator::DefaultTax, :type => :model do
+describe Spree::Calculator::DefaultTax, type: :model do
   let!(:country) { create(:country) }
-  let!(:zone) { create(:zone, :name => "Country Zone", :default_tax => true, :zone_members => []) }
-  let!(:tax_category) { create(:tax_category, :tax_rates => []) }
-  let!(:rate) { create(:tax_rate, :tax_category => tax_category, :amount => 0.05, :included_in_price => included_in_price) }
+  let!(:zone) { create(:zone, name: "Country Zone", default_tax: true, zone_members: []) }
+  let!(:tax_category) { create(:tax_category, tax_rates: []) }
+  let!(:rate) { create(:tax_rate, tax_category: tax_category, amount: 0.05, included_in_price: included_in_price) }
   let(:included_in_price) { false }
-  let!(:calculator) { Spree::Calculator::DefaultTax.new(:calculable => rate ) }
+  let!(:calculator) { Spree::Calculator::DefaultTax.new(calculable: rate) }
   let!(:order) { create(:order) }
-  let!(:line_item) { create(:line_item, :price => 10, :quantity => 3, :tax_category => tax_category) }
-  let!(:shipment) { create(:shipment, :cost => 15) }
+  let!(:line_item) { create(:line_item, price: 10, quantity: 3, tax_category: tax_category) }
+  let!(:shipment) { create(:shipment, cost: 15) }
 
   context "#compute" do
     context "when given an order" do
       let!(:line_item_1) { line_item }
-      let!(:line_item_2) { create(:line_item, :price => 10, :quantity => 3, :tax_category => tax_category) }
+      let!(:line_item_2) { create(:line_item, price: 10, quantity: 3, tax_category: tax_category) }
 
       before do
-        allow(order).to receive_messages :line_items => [line_item_1, line_item_2]
+        allow(order).to receive_messages line_items: [line_item_1, line_item_2]
       end
 
       context "when no line items match the tax category" do
@@ -51,7 +51,6 @@ describe Spree::Calculator::DefaultTax, :type => :model do
             # Amount is 0.51665, which will be rounded to...
             expect(calculator.compute(order)).to eq(0.52)
           end
-
         end
       end
 
@@ -77,10 +76,9 @@ describe Spree::Calculator::DefaultTax, :type => :model do
     context "when tax is included in price" do
       let(:included_in_price) { true }
       context "when the variant matches the tax category" do
-
         context "when line item is discounted" do
           before do
-            line_item.promo_total = -1
+            line_item.taxable_adjustment_total = -1
             Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
           end
 
@@ -88,7 +86,6 @@ describe Spree::Calculator::DefaultTax, :type => :model do
             expect(calculator.compute(line_item)).to eql 1.38
           end
         end
-
         it "should be equal to the item's full price * rate" do
           Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
           expect(calculator.compute(line_item)).to eql 1.43
@@ -98,7 +95,7 @@ describe Spree::Calculator::DefaultTax, :type => :model do
 
     context "when tax is not included in price" do
       context "when the line item is discounted" do
-        before { line_item.promo_total = -1 }
+        before { line_item.taxable_adjustment_total = -1 }
 
         it "should be equal to the item's pre-tax total * rate" do
           expect(calculator.compute(line_item)).to eq(1.45)
@@ -124,4 +121,32 @@ describe Spree::Calculator::DefaultTax, :type => :model do
       end
     end
   end
+
+  context "when given a line_item" do
+    let(:rate) { create(:tax_rate, amount: 0.07, included_in_price: true) }
+    let(:line_item) { create(:line_item, quantity: 50, price: 8.50) }
+
+    subject do
+      Spree::Calculator::DefaultTax.new(calculable: rate).
+        compute_line_item(line_item)
+    end
+
+    describe "#compute_line_item" do
+      it "computes the line item right" do
+        Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
+        expect(subject).to eq(27.80)
+      end
+
+      context "with a 40$ promo" do
+        before do
+          allow(line_item).to receive(:taxable_adjustment_total).and_return(BigDecimal.new("-40"))
+          Spree::TaxRate.store_pre_tax_amount(line_item, [rate])
+        end
+
+        it "computes the line item right" do
+          expect(subject).to eq(25.19)
+        end
+      end
+    end
+  end
 end

data/spec/models/spree/concerns/user_methods_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Spree::UserMethods do
+  let(:test_user) { create :user }
+
+  describe 'Associations' do
+    subject { test_user }
+
+    it 'should have many promotion_rule_users' do
+      is_expected.to have_many(:promotion_rule_users).with_foreign_key(:user_id).
+        class_name('Spree::PromotionRuleUser').dependent(:destroy)
+    end
+
+    it 'should have many role_users' do
+      is_expected.to have_many(:role_users).class_name('Spree::RoleUser').
+        with_foreign_key(:user_id).dependent(:destroy)
+    end
+  end
+
+  describe '#has_spree_role?' do
+    subject { test_user.has_spree_role? name }
+
+    let(:role) { Spree::Role.create(name: name) }
+    let(:name) { 'test' }
+
+    context 'with a role' do
+      before { test_user.spree_roles << role }
+      it { is_expected.to be_truthy }
+    end
+
+    context 'without a role' do
+      it { is_expected.to be_falsy }
+    end
+  end
+
+  describe '#last_incomplete_spree_order' do
+    subject { test_user.last_incomplete_spree_order }
+
+    context 'with an incomplete order' do
+      let(:last_incomplete_order) { create :order, user: test_user }
+
+      before do
+        create(:order, user: test_user, created_at: 1.day.ago)
+        create(:order, user: create(:user))
+        last_incomplete_order
+      end
+
+      it { is_expected.to eq last_incomplete_order }
+    end
+
+    context 'without an incomplete order' do
+      it { is_expected.to be_nil }
+    end
+  end
+end

data/spec/models/spree/concerns/vat_price_calculation_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+
+module Spree
+  describe VatPriceCalculation do
+    let(:test_class) do
+      Class.new do
+        include VatPriceCalculation
+        def total; 10.0; end
+      end
+    end
+
+    describe "#gross_amount" do
+      let(:zone) { Zone.new }
+      let(:tax_category) { TaxCategory.new }
+      let(:price_options) do
+        {
+          tax_zone: zone,
+          tax_category: tax_category
+        }
+      end
+      let(:amount) { 100 }
+
+      subject(:gross_amount) { test_class.new.gross_amount(amount, price_options) }
+
+      context "with no default zone set" do
+        it "does not call TaxRate.included_tax_amount_for" do
+          expect(TaxRate).not_to receive(:included_tax_amount_for)
+          gross_amount
+        end
+      end
+
+      context "with no zone given" do
+        let(:zone) { nil }
+        it "does not call TaxRate.included_tax_amount_for" do
+          expect(TaxRate).not_to receive(:included_tax_amount_for)
+          gross_amount
+        end
+      end
+
+      context "with a default zone set" do
+        let(:default_zone) { Spree::Zone.new }
+        before do
+          allow(Spree::Zone).to receive(:default_tax).and_return(default_zone)
+        end
+
+        context "and zone equal to the default zone" do
+          let(:zone) { default_zone }
+
+          it "does not call 'TaxRate.included_tax_amount_for'" do
+            expect(TaxRate).not_to receive(:included_tax_amount_for)
+            gross_amount
+          end
+        end
+
+        context "and zone not equal to default zone" do
+          let(:zone) { Spree::Zone.new }
+
+          it "calls TaxRate.included_tax_amount_for two times" do
+            expect(TaxRate).to receive(:included_tax_amount_for).twice
+            gross_amount
+          end
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/country_spec.rb

@@ -1,18 +1,55 @@
 require 'spec_helper'
 
 describe Spree::Country, type: :model do
+  let(:america) { create :country }
+  let(:canada)  { create :country, name: 'Canada', iso_name: 'CANADA', numcode: '124' }
+
+  describe 'Callbacks' do
+    it { is_expected.to callback(:ensure_not_default).before(:destroy) }
+  end
+
+  describe 'Associations' do
+    it { is_expected.to have_many(:addresses).dependent(:restrict_with_error) }
+  end
+
+  describe 'Validations' do
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_presence_of(:iso_name) }
+    it { is_expected.to validate_uniqueness_of(:iso_name).case_insensitive }
+    it { is_expected.to validate_uniqueness_of(:name).case_insensitive }
+  end
+
   describe '.default' do
-    let(:america) { create :country }
-    let(:canada)  { create :country, name: 'Canada' }
+    context 'when default_country_id config is set' do
+      before { Spree::Config[:default_country_id] = canada.id }
+      it 'will return the country from the config' do
+        expect(described_class.default.id).to eql canada.id
+      end
+    end
+
+    context 'config is not set though record for america exists' do
+      before { america.touch }
+      it 'will return the US' do
+        expect(described_class.default.id).to eql america.id
+      end
+    end
+  end
+
+  describe 'ensure default country in not deleted' do
+    before { Spree::Config[:default_country_id] = america.id }
+
+    context 'will not destroy country if it is default' do
+      subject { america.destroy }
+      it { is_expected.to be_falsy }
 
-    it 'will return the country from the config' do
-      Spree::Config[:default_country_id] = canada.id
-      expect(described_class.default.id).to eql canada.id
+      context 'error should be default country cannot be deleted' do
+        before { subject }
+        it { expect(america.errors[:base]).to include(Spree.t(:default_country_cannot_be_deleted)) }
+      end
     end
 
-    it 'will return the US if config is not set' do
-      america.touch
-      expect(described_class.default.id).to eql america.id
+    context 'will destroy if it is not a default' do
+      it { expect(canada.destroy).to be_truthy }
     end
   end
 end

data/spec/models/spree/credit_card_spec.rb

@@ -5,7 +5,7 @@ describe Spree::CreditCard, type: :model do
     {
       number: '4111111111111111',
       verification_value: '123',
-      expiry: "12 / #{(Time.now.year + 1).to_s.last(2)}",
+      expiry: "12 / #{(Time.current.year + 1).to_s.last(2)}",
       name: 'Spree Commerce'
     }
   end
@@ -42,12 +42,12 @@ describe Spree::CreditCard, type: :model do
 
   context "#can_capture?" do
     it "should be true if payment is pending" do
-      payment = mock_model(Spree::Payment, pending?: true, created_at: Time.now)
+      payment = mock_model(Spree::Payment, pending?: true, created_at: Time.current)
       expect(credit_card.can_capture?(payment)).to be true
     end
 
     it "should be true if payment is checkout" do
-      payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.now)
+      payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.current)
       expect(credit_card.can_capture?(payment)).to be true
     end
   end
@@ -273,8 +273,8 @@ describe Spree::CreditCard, type: :model do
   context "#to_active_merchant" do
     before do
       credit_card.number = "4111111111111111"
-      credit_card.year = Time.now.year
-      credit_card.month = Time.now.month
+      credit_card.year = Time.current.year
+      credit_card.month = Time.current.month
       credit_card.name = "Ludwig van Beethoven"
       credit_card.verification_value = 123
     end
@@ -282,8 +282,8 @@ describe Spree::CreditCard, type: :model do
     it "converts to an ActiveMerchant::Billing::CreditCard object" do
       am_card = credit_card.to_active_merchant
       expect(am_card.number).to eq("4111111111111111")
-      expect(am_card.year).to eq(Time.now.year)
-      expect(am_card.month).to eq(Time.now.month)
+      expect(am_card.year).to eq(Time.current.year)
+      expect(am_card.month).to eq(Time.current.month)
       expect(am_card.first_name).to eq("Ludwig")
       expect(am_card.last_name).to eq("van Beethoven")
       expect(am_card.verification_value).to eq(123)
@@ -317,7 +317,7 @@ describe Spree::CreditCard, type: :model do
     user = FactoryGirl.create(:user)
     first = FactoryGirl.create(:credit_card, user: user, default: true)
     second = FactoryGirl.create(:credit_card, user: user, default: false)
-    first.update_columns(year: DateTime.now.year, month: 1.month.ago.month)
+    first.update_columns(year: DateTime.current.year, month: 1.month.ago.month)
 
     expect { second.update_attributes!(default: true) }.not_to raise_error
   end

data/spec/models/spree/customer_return_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::CustomerReturn, :type => :model do
+describe Spree::CustomerReturn, type: :model do
   before do
     allow_any_instance_of(Spree::Order).to receive_messages(return!: true)
   end
@@ -79,30 +79,8 @@ describe Spree::CustomerReturn, :type => :model do
     end
   end
 
-  describe ".before_create" do
-    describe "#generate_number" do
-      context "number is assigned" do
-        let(:customer_return) { Spree::CustomerReturn.new(number: '123') }
-
-        it "should return the assigned number" do
-          customer_return.save
-          expect(customer_return.number).to eq('123')
-        end
-      end
-
-      context "number is not assigned" do
-        let(:customer_return) { Spree::CustomerReturn.new(number: nil) }
-
-        before do
-          allow(customer_return).to receive_messages(valid?: true, process_return!: true)
-        end
-
-        it "should assign number with random CR number" do
-          customer_return.save
-          expect(customer_return.number).to match(/CR\d{9}/)
-        end
-      end
-    end
+  describe 'whitelisted_ransackable_attributes' do
+    it { expect(Spree::CustomerReturn.whitelisted_ransackable_attributes).to eq(%w(number)) }
   end
 
   describe "#pre_tax_total" do
@@ -194,7 +172,7 @@ describe Spree::CustomerReturn, :type => :model do
     end
 
     context "to a different stock location" do
-      let(:new_stock_location) { create(:stock_location, :name => "other") }
+      let(:new_stock_location) { create(:stock_location, name: "other") }
 
       it "should update the stock item counts in new stock location" do
         expect {