spree_core 3.0.10 → 3.1.0.rc1

data/spec/models/spree/store_spec.rb

@@ -30,20 +30,48 @@ describe Spree::Store, :type => :model do
     end
   end
 
-  describe ".default" do
-    let!(:store)    { create(:store) }
-    let!(:store_2)  { create(:store, default: true) }
+  describe '.default' do
+    context 'when a default store is already present' do
+      let!(:store)    { create(:store) }
+      let!(:store_2)  { create(:store, default: true) }
 
-    it "should ensure there is a default if one doesn't exist yet" do
-      expect(store_2.default).to be true
-    end
+      it 'should return the already existing default store' do
+        expect(Spree::Store.default).to eq(store_2)
+      end
+
+      it "should ensure there is a default if one doesn't exist yet" do
+        expect(store_2.default).to be true
+      end
+
+      it 'should ensure there is only one default' do
+        [store, store_2].each(&:reload)
 
-    it "should ensure there is only one default" do
-      [store, store_2].each(&:reload)
+        expect(Spree::Store.where(default: true).count).to eq(1)
+        expect(store_2.default).to be true
+        expect(store.default).not_to be true
+      end
+
+      context 'when store is not saved' do
+        before do
+          store.default = true
+          store.code = nil
+          store.save
+        end
+
+        it 'ensure old default location still default' do
+          [store, store_2].each(&:reload)
+          expect(store.default).to be false
+          expect(store_2.default).to be true
+        end
+      end
+    end
 
-      expect(Spree::Store.where(default: true).count).to eq(1)
-      expect(store_2.default).to be true
-      expect(store.default).not_to be true
+    context 'when a default store is not present' do
+      it 'should build a new default store' do
+        expect(Spree::Store.default.class).to eq(Spree::Store)
+        expect(Spree::Store.default.persisted?).to eq(false)
+        expect(Spree::Store.default.default).to be(true)
+      end
     end
   end
 

data/spec/models/spree/tax_category_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
-describe Spree::TaxCategory, :type => :model do
+describe Spree::TaxCategory, type: :model do
+  describe 'Validations' do
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_uniqueness_of(:name).scoped_to(:deleted_at).case_insensitive.allow_blank }
+  end
+
   context 'default tax category' do
     let(:tax_category) { create(:tax_category) }
     let(:new_tax_category) { create(:tax_category) }

data/spec/models/spree/tax_rate_spec.rb

@@ -98,11 +98,8 @@ describe Spree::TaxRate, :type => :model do
         context "when the order has the same tax zone" do
           before do
             allow(order).to receive_messages :tax_zone => @zone
-            allow(order).to receive_messages :tax_address => tax_address
           end
 
-          let(:tax_address) { stub_model(Spree::Address) }
-
           context "when the tax is not a VAT" do
             it { is_expected.to eq([rate]) }
           end
@@ -116,41 +113,21 @@ describe Spree::TaxRate, :type => :model do
         context "when the order has a different tax zone" do
           before do
             allow(order).to receive_messages :tax_zone => create(:zone, :name => "Other Zone")
-            allow(order).to receive_messages :tax_address => tax_address
           end
 
-          context "when the order has a tax_address" do
-            let(:tax_address) { stub_model(Spree::Address) }
-
-            context "when the tax is a VAT" do
-              let(:included_in_price) { true }
-              # The rate should match in this instance because:
-              # 1) It's the default rate (and as such, a negative adjustment should apply)
-              it { is_expected.to eq([rate]) }
-            end
-
-            context "when the tax is not VAT" do
-              it "returns no tax rate" do
-                expect(subject).to be_empty
-              end
+          context "when the tax is a VAT" do
+            let(:included_in_price) { true }
+            # The rate should NOT match in this instance because:
+            # The order has a different tax zone, and the price is
+            # henceforth a net price and will not change.
+            it 'return no tax rate' do
+              expect(subject).to be_empty
             end
           end
 
-          context "when the order does not have a tax_address" do
-            let(:tax_address) { nil}
-
-            context "when the tax is a VAT" do
-              let(:included_in_price) { true }
-              # The rate should match in this instance because:
-              # 1) The order has no tax address by this stage
-              # 2) With no tax address, it has no tax zone
-              # 3) Therefore, we assume the default tax zone
-              # 4) This default zone has a default tax rate.
-              it { is_expected.to eq([rate]) }
-            end
-
-            context "when the tax is not a VAT" do
-              it { is_expected.to be_empty }
+          context "when the tax is not VAT" do
+            it "returns no tax rate" do
+              expect(subject).to be_empty
             end
           end
         end
@@ -158,7 +135,7 @@ describe Spree::TaxRate, :type => :model do
     end
   end
 
-  context ".adjust" do
+  describe ".adjust" do
     let(:order) { stub_model(Spree::Order) }
     let(:tax_category_1) { stub_model(Spree::TaxCategory) }
     let(:tax_category_2) { stub_model(Spree::TaxCategory) }
@@ -201,9 +178,187 @@ describe Spree::TaxRate, :type => :model do
         Spree::TaxRate.adjust(order, shipments)
       end
     end
+
+    context "for MOSS taxation in Europe" do
+      let(:germany) { create :country, name: "Germany" }
+      let(:india) { create :country, name: "India" }
+      let(:france) { create :country, name: "France" }
+      let(:france_zone) { create :zone_with_country, name: "France Zone" }
+      let(:germany_zone) { create :zone_with_country, name: "Germany Zone", default_tax: true }
+      let(:india_zone) { create :zone_with_country, name: "India" }
+      let(:moss_category) { Spree::TaxCategory.create(name: "Digital Goods") }
+      let(:normal_category) { Spree::TaxCategory.create(name: "Analogue Goods") }
+      let(:eu_zone) { create(:zone, name: "EU") }
+
+      let!(:german_vat) do
+        Spree::TaxRate.create(
+          name: "German VAT",
+          amount: 0.19,
+          calculator: Spree::Calculator::DefaultTax.create,
+          tax_category: moss_category,
+          zone: germany_zone,
+          included_in_price: true
+        )
+      end
+      let!(:french_vat) do
+        Spree::TaxRate.create(
+          name: "French VAT",
+          amount: 0.25,
+          calculator: Spree::Calculator::DefaultTax.create,
+          tax_category: moss_category,
+          zone: france_zone,
+          included_in_price: true
+        )
+      end
+      let!(:eu_vat) do
+        Spree::TaxRate.create(
+          name: "EU_VAT",
+          amount: 0.19,
+          calculator: Spree::Calculator::DefaultTax.create,
+          tax_category: normal_category,
+          zone: eu_zone,
+          included_in_price: true
+        )
+      end
+
+      let(:download) { create(:product, tax_category: moss_category, price: 100) }
+      let(:tshirt) { create(:product, tax_category: normal_category, price: 100) }
+      let(:order) { Spree::Order.create }
+
+      before do
+        germany_zone.zone_members.create(zoneable: germany)
+        france_zone.zone_members.create(zoneable: france)
+        india_zone.zone_members.create(zoneable: india)
+        eu_zone.zone_members.create(zoneable: germany)
+        eu_zone.zone_members.create(zoneable: france)
+      end
+
+      context "a download" do
+        before do
+          order.contents.add(download.master, 1)
+        end
+
+        it "without an adress costs 100 euros including tax" do
+          Spree::TaxRate.adjust(order, order.line_items)
+          order.update_with_updater!
+          expect(order.display_total).to eq(Spree::Money.new(100))
+          expect(order.included_tax_total).to eq(15.97)
+        end
+
+        it "to germany costs 100 euros including tax" do
+          allow(order).to receive(:tax_zone).and_return(germany_zone)
+          Spree::TaxRate.adjust(order, order.line_items)
+          order.update_with_updater!
+          expect(order.display_total).to eq(Spree::Money.new(100))
+          expect(order.included_tax_total).to eq(15.97)
+        end
+
+        it "to france costs more including tax" do
+          allow(order).to receive(:tax_zone).and_return(france_zone)
+          order.update_line_item_prices!
+          Spree::TaxRate.adjust(order, order.line_items)
+          order.update_with_updater!
+          expect(order.display_total).to eq(Spree::Money.new(105.04))
+          expect(order.included_tax_total).to eq(21.01)
+          expect(order.additional_tax_total).to eq(0)
+        end
+
+        it "to somewhere else costs the net amount" do
+          allow(order).to receive(:tax_zone).and_return(india_zone)
+          order.update_line_item_prices!
+          Spree::TaxRate.adjust(order, order.line_items)
+          order.update_with_updater!
+          expect(order.included_tax_total).to eq(0)
+          expect(order.included_tax_total).to eq(0)
+          expect(order.display_total).to eq(Spree::Money.new(84.03))
+        end
+      end
+
+      context "a t-shirt" do
+        before do
+          order.contents.add(tshirt.master, 1)
+        end
+
+        it "to germany costs 100 euros including tax" do
+          allow(order).to receive(:tax_zone).and_return(germany_zone)
+          Spree::TaxRate.adjust(order, order.line_items)
+          order.update_with_updater!
+          expect(order.display_total).to eq(Spree::Money.new(100))
+          expect(order.included_tax_total).to eq(15.97)
+        end
+
+        it "to france costs 100 euros including tax" do
+          allow(order).to receive(:tax_zone).and_return(france_zone)
+          order.update_line_item_prices!
+          Spree::TaxRate.adjust(order, order.line_items)
+          order.update_with_updater!
+          expect(order.display_total).to eq(Spree::Money.new(100.00))
+          expect(order.included_tax_total).to eq(15.97)
+          expect(order.additional_tax_total).to eq(0)
+        end
+
+        it "to somewhere else costs the net amount" do
+          allow(order).to receive(:tax_zone).and_return(india_zone)
+          order.update_line_item_prices!
+          Spree::TaxRate.adjust(order, order.line_items)
+          order.update_with_updater!
+          expect(order.included_tax_total).to eq(0)
+          expect(order.display_total).to eq(Spree::Money.new(84.03))
+        end
+      end
+    end
   end
 
-  context "#adjust" do
+  describe ".included_tax_amount_for" do
+    let!(:order) { create :order_with_line_items }
+    let!(:included_tax_rate) do
+      create :tax_rate,
+             included_in_price: true,
+             tax_category: order.line_items.first.tax_category,
+             zone: order.tax_zone,
+             amount: 0.4
+    end
+
+    let!(:other_included_tax_rate) do
+      create :tax_rate,
+             included_in_price: true,
+             tax_category: order.line_items.first.tax_category,
+             zone: order.tax_zone,
+             amount: 0.05
+    end
+
+    let!(:additional_tax_rate) do
+      create :tax_rate,
+             included_in_price: false,
+             tax_category: order.line_items.first.tax_category,
+             zone: order.tax_zone,
+             amount: 0.2
+    end
+
+    let!(:included_tax_rate_from_somewhere_else) do
+      create :tax_rate,
+             included_in_price: true,
+             tax_category: order.line_items.first.tax_category,
+             zone: create(:zone_with_country),
+             amount: 0.1
+    end
+    let(:price_options) do
+      {
+        tax_zone: order.tax_zone,
+        tax_category: line_item.tax_category
+      }
+    end
+
+
+    let(:line_item) { order.line_items.first }
+    subject(:included_tax_amount) { Spree::TaxRate.included_tax_amount_for(price_options) }
+
+    it 'will only get me tax amounts from tax_rates that match' do
+      expect(subject).to eq(included_tax_rate.amount + other_included_tax_rate.amount)
+    end
+  end
+
+  describe "#adjust" do
     before do
       @country = create(:country)
       @zone = create(:zone, :name => "Country Zone", :default_tax => true, :zone_members => [])
@@ -254,7 +409,7 @@ describe Spree::TaxRate, :type => :model do
         context "when zone is contained by default tax zone" do
           it "should create two adjustments, one for each tax rate" do
             Spree::TaxRate.adjust(@order, @order.line_items)
-            expect(line_item.adjustments.count).to eq(1)
+            expect(line_item.adjustments.count).to eq(2)
           end
 
           it "should not create a tax refund" do
@@ -265,11 +420,16 @@ describe Spree::TaxRate, :type => :model do
 
         context "when order's zone is neither the default zone, or included in the default zone, but matches the rate's zone" do
           before do
-            # With no zone members, this zone will not contain anything
-            # Previously:
-            # Zone.stub_chain :default_tax, :contains? => false
-            @zone.zone_members.delete_all
+            new_rate = Spree::TaxRate.create(
+              amount: 0.2,
+              included_in_price: true,
+              calculator: Spree::Calculator::DefaultTax.create,
+              tax_category: @category,
+              zone: create(:zone_with_country)
+            )
+            allow(@order).to receive(:tax_zone).and_return(new_rate.zone)
           end
+
           it "should create an adjustment" do
             Spree::TaxRate.adjust(@order, @order.line_items)
             expect(line_item.adjustments.charge.count).to eq(1)
@@ -296,9 +456,9 @@ describe Spree::TaxRate, :type => :model do
             expect(line_item.adjustments.charge.count).to eq(0)
           end
 
-          it "should create a tax refund for each tax rate" do
+          it "should not create a tax refund for each tax rate" do
             Spree::TaxRate.adjust(@order, @order.line_items)
-            expect(line_item.adjustments.credit.count).to eq(1)
+            expect(line_item.adjustments.credit.count).to eq(0)
           end
         end
 
@@ -320,7 +480,7 @@ describe Spree::TaxRate, :type => :model do
           end
 
           it "should not delete adjustments for complete order when taxrate is deleted" do
-            @order.update_column :completed_at, Time.now
+            @order.update_column :completed_at, Time.current
             @rate1.destroy!
             @rate2.destroy!
             expect(line_item.adjustments.count).to eq(2)
@@ -373,7 +533,7 @@ describe Spree::TaxRate, :type => :model do
 
           it "price adjustments should be accurate" do
             included_tax = @order.line_item_adjustments.sum(:amount)
-            expect(@price_before_taxes + included_tax).to eq(line_item.price)
+            expect(@price_before_taxes + included_tax).to eq(line_item.total)
           end
         end
       end

data/spec/models/spree/user_spec.rb

@@ -1,40 +1,40 @@
 require 'spec_helper'
 
-describe Spree::LegacyUser, :type => :model do
+describe Spree::LegacyUser, type: :model do
   # Regression test for #2844 + #3346
-  context "#last_incomplete_order" do
+  context '#last_incomplete_order' do
     let!(:user) { create(:user) }
     let!(:order) { create(:order, bill_address: create(:address), ship_address: create(:address)) }
 
-    let!(:order_1) { create(:order, :created_at => 1.day.ago, :user => user, :created_by => user) }
-    let!(:order_2) { create(:order, :user => user, :created_by => user) }
-    let!(:order_3) { create(:order, :user => user, :created_by => create(:user)) }
+    let!(:order_1) { create(:order, created_at: 1.day.ago, user: user, created_by: user) }
+    let!(:order_2) { create(:order, user: user, created_by: user) }
+    let!(:order_3) { create(:order, user: user, created_by: create(:user)) }
 
-    it "returns correct order" do
+    it 'returns correct order' do
       expect(user.last_incomplete_spree_order).to eq order_3
     end
 
-    context "persists order address" do
-      it "copies over order addresses" do
-        expect {
+    context 'persists order address' do
+      it 'copies over order addresses' do
+        expect do
           user.persist_order_address(order)
-        }.to change { Spree::Address.count }.by(2)
+        end.to change { Spree::Address.count }.by(2)
 
         expect(user.bill_address).to eq order.bill_address
         expect(user.ship_address).to eq order.ship_address
       end
 
-      it "doesnt create new addresses if user has already" do
+      it 'doesnt create new addresses if user has already' do
         user.update_column(:bill_address_id, create(:address))
         user.update_column(:ship_address_id, create(:address))
         user.reload
 
-        expect {
+        expect do
           user.persist_order_address(order)
-        }.not_to change { Spree::Address.count }
+        end.not_to change { Spree::Address.count }
       end
 
-      it "set both bill and ship address id on subject" do
+      it 'set both bill and ship address id on subject' do
         user.persist_order_address(order)
 
         expect(user.bill_address_id).not_to be_blank
@@ -42,17 +42,17 @@ describe Spree::LegacyUser, :type => :model do
       end
     end
 
-    context "payment source" do
+    context 'payment source' do
       let(:payment_method) { create(:credit_card_payment_method) }
       let!(:cc) do
         create(:credit_card, user_id: user.id, payment_method: payment_method, gateway_customer_profile_id: "2342343")
       end
 
-      it "has payment sources" do
+      it 'has payment sources' do
         expect(user.payment_sources.first.gateway_customer_profile_id).not_to be_empty
       end
 
-      it "drops payment source" do
+      it 'drops payment source' do
         user.drop_payment_source cc
         expect(cc.gateway_customer_profile_id).to be_nil
       end
@@ -60,14 +60,14 @@ describe Spree::LegacyUser, :type => :model do
   end
 end
 
-describe Spree.user_class, :type => :model do
-  context "reporting" do
-    let(:order_value) { BigDecimal.new("80.94") }
+describe Spree.user_class, type: :model do
+  context 'reporting' do
+    let(:order_value) { BigDecimal.new('80.94') }
     let(:order_count) { 4 }
     let(:orders) { Array.new(order_count, double(total: order_value)) }
 
     before do
-      allow(orders).to receive(:pluck).with(:total).and_return(orders.map(&:total))
+      allow(orders).to receive(:sum).with(:total).and_return(orders.sum(&:total))
       allow(orders).to receive(:count).and_return(orders.length)
     end
 
@@ -75,56 +75,123 @@ describe Spree.user_class, :type => :model do
       allow(subject).to receive(:orders).and_return(double(complete: orders))
     end
 
-    describe "#lifetime_value" do
-      context "with orders" do
+    describe '#lifetime_value' do
+      context 'with orders' do
         before { load_orders }
         it "returns the total of completed orders for the user" do
           expect(subject.lifetime_value).to eq (order_count * order_value)
         end
       end
-      context "without orders" do
-        it "returns 0.00" do
+      context 'without orders' do
+        it 'returns 0.00' do
           expect(subject.lifetime_value).to eq BigDecimal("0.00")
         end
       end
     end
 
-    describe "#display_lifetime_value" do
-      it "returns a Spree::Money version of lifetime_value" do
-        value = BigDecimal("500.05")
+    describe '#display_lifetime_value' do
+      it 'returns a Spree::Money version of lifetime_value' do
+        value = BigDecimal('500.05')
         allow(subject).to receive(:lifetime_value).and_return(value)
         expect(subject.display_lifetime_value).to eq Spree::Money.new(value)
       end
     end
 
-    describe "#order_count" do
+    describe '#order_count' do
       before { load_orders }
-      it "returns the count of completed orders for the user" do
+      it 'returns the count of completed orders for the user' do
         expect(subject.order_count).to eq BigDecimal(order_count)
       end
     end
 
-    describe "#average_order_value" do
-      context "with orders" do
+    describe '#average_order_value' do
+      context 'with orders' do
         before { load_orders }
-        it "returns the average completed order price for the user" do
+        it 'returns the average completed order price for the user' do
           expect(subject.average_order_value).to eq order_value
         end
       end
-      context "without orders" do
-        it "returns 0.00" do
-          expect(subject.average_order_value).to eq BigDecimal("0.00")
+      context 'without orders' do
+        it 'returns 0.00' do
+          expect(subject.average_order_value).to eq BigDecimal('0.00')
         end
       end
     end
 
     describe "#display_average_order_value" do
       before { load_orders }
-      it "returns a Spree::Money version of average_order_value" do
-        value = BigDecimal("500.05")
+      it 'returns a Spree::Money version of average_order_value' do
+        value = BigDecimal('500.05')
         allow(subject).to receive(:average_order_value).and_return(value)
         expect(subject.display_average_order_value).to eq Spree::Money.new(value)
       end
     end
   end
+
+  describe '#total_available_store_credit' do
+    context 'user does not have any associated store credits' do
+      subject { create(:user) }
+
+      it 'returns 0' do
+        expect(subject.total_available_store_credit).to be_zero
+      end
+    end
+
+    context 'user has several associated store credits' do
+      let(:user) { create(:user) }
+      let(:amount) { 120.25 }
+      let(:additional_amount) { 55.75 }
+      let(:store_credit) { create(:store_credit, user: user, amount: amount, amount_used: 0.0) }
+      let!(:additional_store_credit) { create(:store_credit, user: user, amount: additional_amount, amount_used: 0.0) }
+
+      subject { store_credit.user }
+
+      context 'part of the store credit has been used' do
+        let(:amount_used) { 35.00 }
+
+        before { store_credit.update_attributes(amount_used: amount_used) }
+
+        context 'part of the store credit has been authorized' do
+          let(:authorized_amount) { 10 }
+
+          before { additional_store_credit.update_attributes(amount_authorized: authorized_amount) }
+
+          it 'returns sum of amounts minus used amount and authorized amount' do
+            available_store_credit = amount + additional_amount - amount_used - authorized_amount
+            expect(subject.total_available_store_credit.to_f).to eq available_store_credit
+          end
+        end
+
+        context 'there are no authorized amounts on any of the store credits' do
+          it 'returns sum of amounts minus used amount' do
+            expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount - amount_used)
+          end
+        end
+      end
+
+      context 'store credits have never been used' do
+        context 'part of the store credit has been authorized' do
+          let(:authorized_amount) { 10 }
+
+          before { additional_store_credit.update_attributes(amount_authorized: authorized_amount) }
+
+          it 'returns sum of amounts minus authorized amount' do
+            expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount - authorized_amount)
+          end
+        end
+
+        context 'there are no authorized amounts on any of the store credits' do
+          it 'returns sum of amounts' do
+            expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount)
+          end
+        end
+      end
+
+      context 'all store credits have never been used or authorized' do
+        it 'returns sum of amounts' do
+          expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount)
+        end
+      end
+    end
+  end
 end