solidus_core 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
+
+module Spree
+  class Calculator
+    describe PercentPerItem, type: :model do
+      it_behaves_like 'a calculator with a description'
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::PriceSack, type: :model do
   let(:calculator) do
@@ -9,6 +10,8 @@ describe Spree::Calculator::PriceSack, type: :model do
     calculator
   end
 
+  it_behaves_like 'a calculator with a description'
+
   let(:order) { stub_model(Spree::Order) }
   let(:shipment) { stub_model(Spree::Shipment, amount: 10) }
 

data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::Returns::DefaultRefundAmount, type: :model do
   let(:line_item_quantity) { 2 }
@@ -9,6 +10,8 @@ describe Spree::Calculator::Returns::DefaultRefundAmount, type: :model do
   let(:calculator) { Spree::Calculator::Returns::DefaultRefundAmount.new }
   let(:order) { line_item.order }
 
+  it_behaves_like 'a calculator with a description'
+
   subject { calculator.compute(return_item) }
 
   context "not an exchange" do

data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 module Spree
   module Calculator::Shipping
@@ -6,6 +7,8 @@ module Spree
       let(:variant1) { build(:variant, price: 10.11) }
       let(:variant2) { build(:variant, price: 20.2222) }
 
+      it_behaves_like 'a calculator with a description'
+
       let(:line_item1) { build(:line_item, variant: variant1) }
       let(:line_item2) { build(:line_item, variant: variant2) }
 

data/spec/models/spree/calculator/shipping/flat_rate_spec.rb

@@ -1,10 +1,13 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 module Spree
   module Calculator::Shipping
     describe FlatRate, type: :model do
       subject { Calculator::Shipping::FlatRate.new(preferred_amount: 4.00) }
 
+      it_behaves_like 'a calculator with a description'
+
       it 'always returns the same rate' do
         expect(subject.compute(build(:stock_package_fulfilled))).to eql 4.00
       end

data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 module Spree
   module Calculator::Shipping
@@ -6,6 +7,8 @@ module Spree
       let(:variant1) { build(:variant, price: 10) }
       let(:variant2) { build(:variant, price: 20) }
 
+      it_behaves_like 'a calculator with a description'
+
       let(:package) do
         build(:stock_package, variants_contents: { variant1 => 4, variant2 => 6 })
       end

data/spec/models/spree/calculator/shipping/per_item_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 module Spree
   module Calculator::Shipping
@@ -6,6 +7,8 @@ module Spree
       let(:variant1) { build(:variant) }
       let(:variant2) { build(:variant) }
 
+      it_behaves_like 'a calculator with a description'
+
       let(:package) do
         build(:stock_package, variants_contents: { variant1 => 5, variant2 => 3 })
       end

data/spec/models/spree/calculator/shipping/price_sack_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
-describe Spree::Calculator::PriceSack, type: :model do
+describe Spree::Calculator::Shipping::PriceSack, type: :model do
   let(:calculator) do
     calculator = Spree::Calculator::PriceSack.new
     calculator.preferred_minimal_amount = 5
@@ -9,6 +10,8 @@ describe Spree::Calculator::PriceSack, type: :model do
     calculator
   end
 
+  it_behaves_like 'a calculator with a description'
+
   let(:order) { stub_model(Spree::Order) }
   let(:shipment) { stub_model(Spree::Shipment, amount: 10) }
 

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

@@ -1,8 +1,11 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::TieredFlatRate, type: :model do
   let(:calculator) { Spree::Calculator::TieredFlatRate.new }
 
+  it_behaves_like 'a calculator with a description'
+
   describe "#valid?" do
     subject { calculator.valid? }
     context "when tiers is a hash" do

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

@@ -1,8 +1,11 @@
 require 'spec_helper'
+require 'shared_examples/calculator_shared_examples'
 
 describe Spree::Calculator::TieredPercent, type: :model do
   let(:calculator) { Spree::Calculator::TieredPercent.new }
 
+  it_behaves_like 'a calculator with a description'
+
   describe "#valid?" do
     subject { calculator.valid? }
     context "when base percent is less than zero" do

data/spec/models/spree/credit_card_spec.rb

@@ -160,6 +160,28 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
+  describe "#verification_value=" do
+    it "accepts a valid 3-digit value" do
+      credit_card.verification_value = "123"
+      expect(credit_card.verification_value).to eq("123")
+    end
+
+    it "accepts a valid 4-digit value" do
+      credit_card.verification_value = "1234"
+      expect(credit_card.verification_value).to eq("1234")
+    end
+
+    it "stringifies an integer" do
+      credit_card.verification_value = 123
+      expect(credit_card.verification_value).to eq("123")
+    end
+
+    it "strips any whitespace" do
+      credit_card.verification_value = ' 1 2  3 '
+      expect(credit_card.verification_value).to eq('123')
+    end
+  end
+
   # Regression test for https://github.com/spree/spree/issues/3847 and https://github.com/spree/spree/issues/3896
   describe "#expiry=" do
     it "can set with a 2-digit month and year" do
@@ -235,6 +257,10 @@ describe Spree::CreditCard, type: :model do
       credit_card.cc_type = ''
       expect(credit_card.cc_type).to eq('master')
 
+      credit_card.number = '2221000000000000'
+      credit_card.cc_type = ''
+      expect(credit_card.cc_type).to eq('master')
+
       credit_card.number = '378282246310005'
       credit_card.cc_type = ''
       expect(credit_card.cc_type).to eq('american_express')
@@ -299,7 +325,7 @@ describe Spree::CreditCard, type: :model do
       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)
+      expect(am_card.verification_value).to eq("123")
     end
   end
 

data/spec/models/spree/line_item_spec.rb

@@ -35,41 +35,6 @@ describe Spree::LineItem, type: :model do
     end
   end
 
-  context "#create" do
-    let(:variant) { create(:variant) }
-
-    before do
-      create(:tax_rate, zone: order.tax_zone, tax_category: variant.tax_category)
-    end
-
-    context "when order has a tax zone" do
-      before do
-        expect(order.tax_zone).to be_present
-      end
-
-      it "creates a tax adjustment" do
-        order.contents.add(variant)
-        line_item = order.find_line_item_by_variant(variant)
-        expect(line_item.adjustments.tax.count).to eq(1)
-      end
-    end
-
-    context "when order does not have a tax zone" do
-      before do
-        order.bill_address = nil
-        order.ship_address = nil
-        order.save
-        expect(order.reload.tax_zone).to be_nil
-      end
-
-      it "does not create a tax adjustment" do
-        order.contents.add(variant)
-        line_item = order.find_line_item_by_variant(variant)
-        expect(line_item.adjustments.tax.count).to eq(0)
-      end
-    end
-  end
-
   describe 'line item creation' do
     let(:variant) { create :variant }
 
@@ -102,7 +67,6 @@ describe Spree::LineItem, type: :model do
       before(:context) do
         Spree::LineItem.class_eval do
           def copy_price
-            self.currency = "USD"
             self.cost_price = 10
             self.price = 20
           end
@@ -163,66 +127,95 @@ describe Spree::LineItem, type: :model do
     end
   end
 
-  context 'setting the currency' do
-    let(:line_item) { order.line_items.first }
+  context 'setting a line item price' do
+    let(:store) { create(:store, default: true) }
+    let(:order) { Spree::Order.new(currency: "RUB", store: store) }
+    let(:variant) { Spree::Variant.new(product: Spree::Product.new) }
+    let(:line_item) { Spree::LineItem.new(order: order, variant: variant) }
 
-    context "currency same as order.currency" do
-      it "is a valid line item" do
-        line_item.currency = order.currency
-        line_item.valid?
+    before { expect(variant).to receive(:price_for).at_least(:once).and_return(price) }
 
-        expect(line_item.error_on(:currency).size).to eq(0)
+    context "when a price exists in order currency" do
+      let(:price) { Spree::Money.new(99.00, currency: "RUB") }
+
+      it "is a valid line item" do
+        expect(line_item.valid?).to be_truthy
+        expect(line_item.error_on(:price).size).to eq(0)
       end
     end
 
-    context "currency different than order.currency" do
-      it "is not a valid line item" do
-        expect(Spree::Deprecation).to receive(:warn).at_least(:once)
-        line_item.currency = "RUB"
-        line_item.valid?
+    context "when a price does not exist in order currency" do
+      let(:price) { nil }
 
-        expect(line_item.error_on(:currency).size).to eq(1)
+      it "is not a valid line item" do
+        expect(line_item.valid?).to be_falsey
+        expect(line_item.error_on(:price).size).to eq(1)
       end
     end
   end
 
   describe "#options=" do
-    it "can handle updating a blank line item with no order" do
-      line_item.options = { price: 123 }
-    end
+    let(:options) { { price: 123, quantity: 5 } }
 
     it "updates the data provided in the options" do
-      line_item.options = { price: 123 }
+      line_item.options = options
+
       expect(line_item.price).to eq 123
+      expect(line_item.quantity).to eq 5
     end
 
-    it "updates the price based on the options provided" do
-      expect(line_item).to receive(:gift_wrap=).with(true)
-      expect(line_item).to receive(:money_price=)
-      line_item.options = { gift_wrap: true }
+    context "when price is not provided" do
+      let(:options) { { quantity: 5 } }
+
+      it "sets price anyway, retrieving it from line item options" do
+        expect(line_item.variant)
+          .to receive(:price_for)
+          .and_return(Spree::Money.new(123, currency: "USD"))
+
+        line_item.options = options
+
+        expect(line_item.price).to eq 123
+        expect(line_item.quantity).to eq 5
+      end
     end
   end
 
   describe 'money_price=' do
-    let(:line_item) { Spree::LineItem.new }
-    let(:new_price) { Spree::Money.new(99.00, currency: "RUB") }
+    let(:currency) { "USD" }
+    let(:new_price) { Spree::Money.new(99.00, currency: currency) }
 
-    it 'assigns a new price and currency' do
+    it 'assigns a new price' do
       line_item.money_price = new_price
       expect(line_item.price).to eq(new_price.cents / 100.0)
-      expect(line_item.currency).to eq(new_price.currency.iso_code)
+    end
+
+    context 'when the new price is nil' do
+      let(:new_price) { nil }
+
+      it 'makes the line item price empty' do
+        line_item.money_price = new_price
+        expect(line_item.price).to be_nil
+      end
+    end
+
+    context 'when the price has a currency different from the order currency' do
+      let(:currency) { "RUB" }
+
+      it 'raises an exception' do
+        expect {
+          line_item.money_price = new_price
+        }.to raise_exception Spree::LineItem::CurrencyMismatch
+      end
     end
   end
 
   describe "#pricing_options" do
-    let(:line_item) { Spree::LineItem.new(currency: "RUB") }
-
     subject { line_item.pricing_options }
 
     it { is_expected.to be_a(Spree::Config.pricing_options_class) }
 
-    it "holds the line items's currency" do
-      expect(subject.currency).to eq("RUB")
+    it "holds the order currency" do
+      expect(subject.currency).to eq("USD")
     end
   end
 end

data/spec/models/spree/order/checkout_spec.rb

@@ -183,7 +183,8 @@ describe Spree::Order, type: :model do
       end
 
       it "recalculates tax and updates totals" do
-        create(:tax_rate, tax_category: line_item.tax_category, amount: 0.05, zone: order.tax_zone)
+        zone = create(:zone, countries: [order.tax_address.country])
+        create(:tax_rate, tax_category: line_item.tax_category, amount: 0.05, zone: zone)
         order.next!
         expect(order).to have_attributes(
           adjustment_total: 0.5,

data/spec/models/spree/order/payment_spec.rb

@@ -22,8 +22,8 @@ module Spree
         expect(order.payment_state).to eq('paid')
         expect(order.payment_total).to eq(100)
 
-        expect(payment_1.reload).to be_completed
-        expect(payment_2.reload).to be_completed
+        expect(payment_1).to be_completed
+        expect(payment_2).to be_completed
       end
 
       it 'does not go over total for order' do
@@ -37,18 +37,17 @@ module Spree
         expect(order.payment_state).to eq('paid')
         expect(order.payment_total).to eq(100)
 
-        expect(payment_1.reload).to be_completed
-        expect(payment_2.reload).to be_completed
-        expect(payment_3.reload).to be_checkout
+        expect(payment_1).to be_completed
+        expect(payment_2).to be_completed
+        expect(payment_3).to be_checkout
       end
 
       it "does not use failed payments" do
-        create(:payment, order: order, amount: 50)
-        create(:payment, order: order, amount: 50, state: 'failed')
-        order.payments.reload
+        payment1 = create(:payment, order: order, amount: 50)
+        payment2 = create(:payment, order: order, amount: 50, state: 'failed')
 
-        expect(order.payments[0]).to receive(:process!).and_call_original
-        expect(order.payments[1]).not_to receive(:process!)
+        expect(payment1).to receive(:process!).and_call_original
+        expect(payment2).not_to receive(:process!)
 
         order.process_payments!
 

data/spec/models/spree/order/tax_spec.rb

@@ -12,7 +12,9 @@ module Spree
 
       context "when no zones exist" do
         it "should return nil" do
-          expect(order.tax_zone).to be_nil
+          Spree::Deprecation.silence do
+            expect(order.tax_zone).to be_nil
+          end
         end
       end
 
@@ -22,7 +24,9 @@ module Spree
         it "should calculate using ship_address" do
           expect(Spree::Zone).to receive(:match).at_least(:once).with(ship_address)
           expect(Spree::Zone).not_to receive(:match).with(bill_address)
-          order.tax_zone
+          Spree::Deprecation.silence do
+            order.tax_zone
+          end
         end
       end
 
@@ -32,7 +36,9 @@ module Spree
         it "should calculate using bill_address" do
           expect(Spree::Zone).to receive(:match).at_least(:once).with(bill_address)
           expect(Spree::Zone).not_to receive(:match).with(ship_address)
-          order.tax_zone
+          Spree::Deprecation.silence do
+            order.tax_zone
+          end
         end
       end
 
@@ -46,7 +52,9 @@ module Spree
           before { allow(Spree::Zone).to receive_messages(match: zone) }
 
           it "should return the matching zone" do
-            expect(order.tax_zone).to eq(zone)
+            Spree::Deprecation.silence do
+              expect(order.tax_zone).to eq(zone)
+            end
           end
         end
 
@@ -54,7 +62,9 @@ module Spree
           before { allow(Spree::Zone).to receive_messages(match: nil) }
 
           it "should return the default tax zone" do
-            expect(order.tax_zone).to eq(@default_zone)
+            Spree::Deprecation.silence do
+              expect(order.tax_zone).to eq(@default_zone)
+            end
           end
         end
       end
@@ -66,7 +76,9 @@ module Spree
           before { allow(Spree::Zone).to receive_messages(match: zone) }
 
           it "should return the matching zone" do
-            expect(order.tax_zone).to eq(zone)
+            Spree::Deprecation.silence do
+              expect(order.tax_zone).to eq(zone)
+            end
           end
         end
 
@@ -74,10 +86,13 @@ module Spree
           before { allow(Spree::Zone).to receive_messages(match: nil) }
 
           it "should return nil" do
-            expect(order.tax_zone).to be_nil
+            Spree::Deprecation.silence do
+              expect(order.tax_zone).to be_nil
+            end
           end
         end
       end
+
     end
   end
 end