solidus_core 1.2.3 → 1.3.0.beta1

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

@@ -1,21 +1,19 @@
 require 'spec_helper'
 
-describe Spree::Calculator::Returns::DefaultRefundAmount, :type => :model do
-  let(:order)           { create(:order) }
+describe Spree::Calculator::Returns::DefaultRefundAmount, type: :model do
   let(:line_item_quantity) { 2 }
-  let(:pre_tax_amount)  { 100.0 }
-  let(:line_item)       { create(:line_item, price: 100.0, quantity: line_item_quantity, pre_tax_amount: pre_tax_amount) }
+  let(:line_item_price) { 100.0 }
+  let(:line_item) { create(:line_item, price: line_item_price, quantity: line_item_quantity) }
   let(:inventory_unit) { build(:inventory_unit, order: order, line_item: line_item) }
   let(:return_item) { build(:return_item, inventory_unit: inventory_unit ) }
   let(:calculator) { Spree::Calculator::Returns::DefaultRefundAmount.new }
-
-  before { order.line_items << line_item }
+  let(:order) { line_item.order }
 
   subject { calculator.compute(return_item) }
 
   context "not an exchange" do
     context "no promotions or taxes" do
-      it { is_expected.to eq pre_tax_amount / line_item_quantity }
+      it { is_expected.to eq line_item_price }
     end
 
     context "order adjustments" do
@@ -35,7 +33,7 @@ describe Spree::Calculator::Returns::DefaultRefundAmount, :type => :model do
         order.adjustments.first.update_attributes(amount: adjustment_amount)
       end
 
-      it { is_expected.to eq (pre_tax_amount - adjustment_amount.abs) / line_item_quantity }
+      it { is_expected.to eq line_item_price - (adjustment_amount.abs / line_item_quantity) }
     end
 
     context "shipping adjustments" do
@@ -43,7 +41,7 @@ describe Spree::Calculator::Returns::DefaultRefundAmount, :type => :model do
 
       before { order.shipments << Spree::Shipment.new(adjustment_total: adjustment_total) }
 
-      it { is_expected.to eq pre_tax_amount / line_item_quantity }
+      it { is_expected.to eq line_item_price }
     end
   end
 
@@ -53,8 +51,8 @@ describe Spree::Calculator::Returns::DefaultRefundAmount, :type => :model do
     it { is_expected.to eq 0.0 }
   end
 
-  context "pre_tax_amount is zero" do
-    let(:pre_tax_amount)  { 0.0 }
+  context "line item amount is zero" do
+    let(:line_item_price) { 0 }
     it { is_expected.to eq 0.0 }
   end
 end

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

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 module Spree
   module Calculator::Shipping
-    describe FlatPercentItemTotal, :type => :model do
-      let(:variant1) { build(:variant, :price => 10.11) }
-      let(:variant2) { build(:variant, :price => 20.2222) }
+    describe FlatPercentItemTotal, type: :model do
+      let(:variant1) { build(:variant, price: 10.11) }
+      let(:variant2) { build(:variant, price: 20.2222) }
 
       let(:line_item1) { build(:line_item, variant: variant1) }
       let(:line_item2) { build(:line_item, variant: variant2) }
@@ -13,7 +13,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 2, variant2 => 1 })
       end
 
-      subject { FlatPercentItemTotal.new(:preferred_flat_percent => 10) }
+      subject { FlatPercentItemTotal.new(preferred_flat_percent: 10) }
 
       it "should round result correctly" do
         expect(subject.compute(package)).to eq(4.04)

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

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 module Spree
   module Calculator::Shipping
-    describe FlatRate, :type => :model do
-      subject { Calculator::Shipping::FlatRate.new(:preferred_amount => 4.00) }
+    describe FlatRate, type: :model do
+      subject { Calculator::Shipping::FlatRate.new(preferred_amount: 4.00) }
 
       it 'always returns the same rate' do
         expect(subject.compute(build(:stock_package_fulfilled))).to eql 4.00

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

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 module Spree
   module Calculator::Shipping
-    describe FlexiRate, :type => :model do
-      let(:variant1) { build(:variant, :price => 10) }
-      let(:variant2) { build(:variant, :price => 20) }
+    describe FlexiRate, type: :model do
+      let(:variant1) { build(:variant, price: 10) }
+      let(:variant2) { build(:variant, price: 20) }
 
       let(:package) do
         build(:stock_package, variants_contents: { variant1 => 4, variant2 => 6 })
@@ -41,12 +41,11 @@ module Spree
         end
 
         it "should allow creation of new object with all the attributes" do
-          FlexiRate.new(:preferred_first_item => 1,
-                        :preferred_additional_item => 1,
-                        :preferred_max_items => 1)
+          FlexiRate.new(preferred_first_item: 1,
+                        preferred_additional_item: 1,
+                        preferred_max_items: 1)
         end
       end
     end
   end
 end
-

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   module Calculator::Shipping
-    describe PerItem, :type => :model do
+    describe PerItem, type: :model do
       let(:variant1) { build(:variant) }
       let(:variant2) { build(:variant) }
 
@@ -10,7 +10,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 5, variant2 => 3 })
       end
 
-      subject { PerItem.new(:preferred_amount => 10) }
+      subject { PerItem.new(preferred_amount: 10) }
 
       it "correctly calculates per item shipping" do
         expect(subject.compute(package).to_f).to eq(80) # 5 x 10 + 3 x 10

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Calculator::PriceSack, :type => :model do
+describe Spree::Calculator::PriceSack, type: :model do
   let(:calculator) do
     calculator = Spree::Calculator::PriceSack.new
     calculator.preferred_minimal_amount = 5
@@ -10,7 +10,7 @@ describe Spree::Calculator::PriceSack, :type => :model do
   end
 
   let(:order) { stub_model(Spree::Order) }
-  let(:shipment) { stub_model(Spree::Shipment, :amount => 10) }
+  let(:shipment) { stub_model(Spree::Shipment, amount: 10) }
 
   # Regression test for https://github.com/spree/spree/issues/714 and https://github.com/spree/spree/issues/739
   it "computes with an order object" do

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Calculator::TieredFlatRate, :type => :model do
+describe Spree::Calculator::TieredFlatRate, type: :model do
   let(:calculator) { Spree::Calculator::TieredFlatRate.new }
 
   describe "#valid?" do
@@ -33,4 +33,3 @@ describe Spree::Calculator::TieredFlatRate, :type => :model do
     end
   end
 end
-

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Calculator::TieredPercent, :type => :model do
+describe Spree::Calculator::TieredPercent, type: :model do
   let(:calculator) { Spree::Calculator::TieredPercent.new }
 
   describe "#valid?" do

data/spec/models/spree/calculator_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
-
-describe Spree::Calculator, :type => :model do
-
+describe Spree::Calculator, type: :model do
   class SimpleCalculator < Spree::Calculator
-    def compute_simple_computable line_item
+    def compute_simple_computable(_line_item)
       'computed'
     end
   end
@@ -12,16 +10,14 @@ describe Spree::Calculator, :type => :model do
   class SimpleComputable
   end
 
-
   context "with computable" do
-
     let(:calculator) { SimpleCalculator.new }
     let(:computable) { SimpleComputable.new }
 
     subject { SimpleCalculator.new.compute computable }
 
     it 'calls compute method of class type' do
-      expect(subject).to eq ( 'computed' )
+      expect(subject).to eq  'computed'
     end
 
     context 'computable does not implement right function name' do
@@ -31,6 +27,5 @@ describe Spree::Calculator, :type => :model do
         expect { subject }.to raise_error NotImplementedError, /Please implement \'compute_line_item\(line_item\)\' in your calculator/
       end
     end
-
   end
 end

data/spec/models/spree/carton_spec.rb

@@ -105,7 +105,7 @@ describe Spree::Carton do
     it "contains only the items in both the carton and order" do
       expect(subject.map(&:line_item)).to eq [first_line_item]
     end
-  end 
+  end
 
   describe "#any_exchanges?" do
     subject { carton.any_exchanges? }

data/spec/models/spree/classification_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Classification, :type => :model do
+  describe Classification, type: :model do
     # Regression test for https://github.com/spree/spree/issues/3494
     it "cannot link the same taxon to the same product more than once" do
       product = create(:product)

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 module Spree
-
   describe DisplayMoney do
     let(:test_class) do
       Class.new do

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

@@ -5,9 +5,34 @@ describe Spree::OrderedPropertyValueList do
   # Using ProductProperty as a subject
   # since it includes OrderedPropertyValueList
   #
-  let(:product_property) { create(:product_property) }
+
+  context 'positioning' do
+    let(:product_1) { create(:product) }
+    let!(:property_1) { create(:product_property, product: product_1) }
+    let!(:property_2) { create(:product_property, product: product_1) }
+
+    let(:product_2) { create(:product) }
+    let!(:property_3) { create(:product_property, product: product_2) }
+    let!(:property_4) { create(:product_property, product: product_2) }
+
+    before do
+      property_1.update_attribute(:position, 0)
+      property_2.update_attribute(:position, 1)
+      property_3.update_attribute(:position, 0)
+      property_4.update_attribute(:position, 1)
+    end
+
+    it 'scopes position to the product' do
+      expect(property_1.reload.position).to eq(0)
+      expect(property_2.reload.position).to eq(1)
+      expect(property_3.reload.position).to eq(0)
+      expect(property_4.reload.position).to eq(1)
+    end
+  end
 
   context "validations" do
+    let(:product_property) { create(:product_property) }
+
     # Only MySQL stores or stores that were migrated prior to the Rails 4.2
     # upgrade have length limitations on "value":
     # > The PostgreSQL and SQLite adapters no longer add a default limit of 255

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

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module Spree
   describe UserAddressBook do
-
     #
     # Using LegacyUser as a subject
     # since it uses the UserAddressBookExtension
@@ -50,7 +49,6 @@ module Spree
           end
 
           context "an odd flip-flop corner case discovered running backfill rake task" do
-
             before do
               user.save_in_address_book(original_default_address.attributes, true)
               user.save_in_address_book(address.attributes, true)
@@ -77,7 +75,7 @@ module Spree
           end
 
           context "and changing another address field at the same time" do
-            let(:updated_address_attributes) { address.attributes.tap {|a| a[:first_name] = "Newbie"} }
+            let(:updated_address_attributes) { address.attributes.tap { |a| a[:first_name] = "Newbie" } }
 
             subject { user.save_in_address_book(updated_address_attributes, true) }
 
@@ -104,7 +102,7 @@ module Spree
         let(:address1) { create(:address) }
         let(:address2) { create(:address, firstname: "Different") }
         let(:updated_attrs) do
-          address2.attributes.tap {|a| a[:firstname] = "Johnny" }
+          address2.attributes.tap { |a| a[:firstname] = "Johnny" }
         end
 
         before do
@@ -220,7 +218,7 @@ module Spree
     context "#remove_from_address_book" do
       let(:address1) { create(:address) }
       let(:address2) { create(:address, firstname: "Different") }
-      let(:remove_id) { address1.id}
+      let(:remove_id) { address1.id }
       subject { user.remove_from_address_book(remove_id) }
 
       before do
@@ -240,11 +238,20 @@ module Spree
       end
 
       it "returns false if the addresses is not there" do
-        expect(user.remove_from_address_book(42)).to be false
+        expect(user.remove_from_address_book(0)).to be false
       end
     end
 
     context "#persist_order_address" do
+      it 'will save the bill/ship_address reference if it can' do
+        order = create :order
+        user.persist_order_address(order)
+
+        expect( user.bill_address_id ).to eq order.bill_address_id
+        expect( user.ship_address_id ).to eq order.ship_address_id
+        expect( user.bill_address_id ).not_to eq user.ship_address_id
+      end
+
       context "when automatic_default_address preference is at a default of true" do
         before do
           Spree::Config.automatic_default_address = true
@@ -261,8 +268,8 @@ module Spree
       context "when automatic_default_address preference is false" do
         before do
           Spree::Config.automatic_default_address = false
-          expect(user).to receive(:save_in_address_book).with(kind_of(Hash),false).twice
-            #and not the optional 2nd argument
+          expect(user).to receive(:save_in_address_book).with(kind_of(Hash), false).twice
+          # and not the optional 2nd argument
         end
 
         it "does not set the default: true flag" do
@@ -307,11 +314,11 @@ module Spree
           user.persist_order_address(order)
         end
 
-          it "does not call save_in_address_book on bill address" do
-          order = build(:order)
-          order.bill_address = nil
+        it "does not call save_in_address_book on bill address" do
+        order = build(:order)
+        order.bill_address = nil
 
-          user.persist_order_address(order)
+        user.persist_order_address(order)
         end
       end
     end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::UserMethods do
-  let(:test_user)        { create :user }
+  let(:test_user) { create :user }
 
   describe '#has_spree_role?' do
     subject { test_user.has_spree_role? name }

data/spec/models/spree/country_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Spree::Country, type: :model do
+  describe '.default' do
+    before do
+      create(:country, iso: "DE", id: 1)
+      create(:country, id: 2)
+    end
+
+    subject(:default_country) { described_class.default }
+
+    context 'with the configuration setting an existing legacy default country ID' do
+      before do
+        Spree::Config[:default_country_id] = 2
+      end
+
+      it 'emits a deprecation warning' do
+        expect(ActiveSupport::Deprecation).to receive(:warn)
+        default_country
+      end
+
+      it 'is the country with that ID' do
+        expect(default_country).to eq(Spree::Country.find(2))
+      end
+    end
+
+    context 'with the configuration setting a non-existing legacy default country ID' do
+      before do
+        Spree::Config[:default_country_id] = 0
+      end
+
+      it 'loads the country configured by the ISO code' do
+        expect(default_country).to eq(Spree::Country.find(2))
+      end
+    end
+
+    context 'with the configuration setting an existing ISO code' do
+      it 'is a country with the configurations ISO code' do
+        expect(described_class.default).to be_a(Spree::Country)
+        expect(described_class.default.iso).to eq('US')
+      end
+    end
+
+    context 'with the configuration setting an non-existing ISO code' do
+      before { Spree::Config[:default_country_iso] = "ZZ" }
+
+      it 'raises a Record not Found error' do
+        expect { described_class.default }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end

data/spec/models/spree/credit_card_spec.rb

@@ -17,9 +17,8 @@ describe Spree::CreditCard, type: :model do
   let(:credit_card) { Spree::CreditCard.new }
 
   before(:each) do
-
     @order = create(:order)
-    @payment = Spree::Payment.create(:amount => 100, :order => @order)
+    @payment = Spree::Payment.create(amount: 100, order: @order)
 
     @success_response = double('gateway_response', success?: true, authorization: '123', avs_result: { 'code' => 'avs-code' })
     @fail_response = double('gateway_response', success?: false)
@@ -30,7 +29,7 @@ describe Spree::CreditCard, type: :model do
       purchase: @success_response,
       capture: @success_response,
       void: @success_response,
-      credit: @success_response,
+      credit: @success_response
     )
 
     allow(@payment).to receive_messages payment_method: @payment_gateway
@@ -117,10 +116,17 @@ describe Spree::CreditCard, type: :model do
     end
 
     let!(:persisted_card) { Spree::CreditCard.find(credit_card.id) }
-    let (:valid_address_attributes) { {firstname: "Hugo", lastname: "Furst",
-                                       address1: "123 Main", city: "Somewhere",
-                                       country_id: 1, zipcode: 55555,
-                                       phone: "1234567890"} }
+    let(:valid_address_attributes) do
+      {
+        firstname: "Hugo",
+        lastname: "Furst",
+        address1: "123 Main",
+        city: "Somewhere",
+        country_id: 1,
+        zipcode: 55_555,
+        phone: "1234567890"
+      }
+    end
 
     it "should not actually store the number" do
       expect(persisted_card.number).to be_blank
@@ -131,10 +137,10 @@ describe Spree::CreditCard, type: :model do
     end
 
     it "should save and update addresses through nested attributes" do
-      persisted_card.update_attributes({address_attributes: valid_address_attributes})
+      persisted_card.update_attributes({ address_attributes: valid_address_attributes })
       persisted_card.save!
-      updated_attributes = {id: persisted_card.address.id, address1: "123 Main St."}
-      persisted_card.update_attributes({address_attributes: updated_attributes})
+      updated_attributes = { id: persisted_card.address.id, address1: "123 Main St." }
+      persisted_card.update_attributes({ address_attributes: updated_attributes })
       expect(persisted_card.address.address1).to eq "123 Main St."
     end
   end
@@ -149,7 +155,7 @@ describe Spree::CreditCard, type: :model do
     end
 
     it "should not raise an exception on non-string input" do
-      credit_card.number = Hash.new
+      credit_card.number = {}
       expect(credit_card.number).to be_nil
     end
   end
@@ -200,7 +206,6 @@ describe Spree::CreditCard, type: :model do
     it "does not blow up when passed one number" do
       credit_card.expiry = '12'
     end
-
   end
 
   context "#cc_type=" do

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
@@ -33,7 +33,6 @@ describe Spree::CustomerReturn, :type => :model do
           subject
           expect(customer_return.errors.full_messages).to include(Spree.t(:return_items_cannot_be_associated_with_multiple_orders))
         end
-
       end
 
       context "return items are part of the same order" do
@@ -73,52 +72,60 @@ describe Spree::CustomerReturn, :type => :model do
   end
 
   describe "#total" do
-    let(:pre_tax_amount)  { 15.0 }
-    let(:tax_amount)  { 5.0 }
+    let(:amount) { 15.0 }
+    let(:tax_amount) { 5.0 }
     let(:customer_return) { create(:customer_return, line_items_count: 2) }
 
     before do
-      Spree::ReturnItem.where(customer_return_id: customer_return.id).update_all(pre_tax_amount: pre_tax_amount, additional_tax_total: tax_amount)
+      Spree::ReturnItem.where(customer_return_id: customer_return.id).update_all(amount: amount, additional_tax_total: tax_amount)
       customer_return.reload
     end
 
     subject { customer_return.total }
 
     it "returns the sum of the return item's total amount" do
-      expect(subject).to eq ((pre_tax_amount * 2) + (tax_amount * 2))
+      expect(subject).to eq((amount * 2) + (tax_amount * 2))
     end
   end
 
   describe "#display_total" do
-    let(:customer_return) { Spree::CustomerReturn.new }
+    let(:customer_return) { stub_model(Spree::CustomerReturn, total: 21.22, currency: "GBP") }
 
     it "returns a Spree::Money" do
-      allow(customer_return).to receive_messages(total: 21.22)
-      expect(customer_return.display_total).to eq(Spree::Money.new(21.22))
+      expect(customer_return.display_total).to eq(Spree::Money.new(21.22, currency: "GBP"))
+    end
+  end
+
+  describe "#currency" do
+    let(:order) { stub_model(Spree::Order, currency: "GBP") }
+    let(:customer_return) { stub_model(Spree::CustomerReturn, order: order) }
+
+    it 'returns the order currency' do
+      expect(Spree::Config.currency).to eq("USD")
+      expect(customer_return.currency).to eq("GBP")
     end
   end
 
-  describe "#pre_tax_total" do
-    let(:pre_tax_amount)  { 15.0 }
+  describe "#amount" do
+    let(:amount) { 15.0 }
     let(:customer_return) { create(:customer_return, line_items_count: 2) }
 
     before do
-      Spree::ReturnItem.where(customer_return_id: customer_return.id).update_all(pre_tax_amount: pre_tax_amount)
+      Spree::ReturnItem.where(customer_return_id: customer_return.id).update_all(amount: amount)
     end
 
-    subject { customer_return.pre_tax_total }
+    subject { customer_return.amount }
 
-    it "returns the sum of the return item's pre_tax_amount" do
-      expect(subject).to eq (pre_tax_amount * 2)
+    it "returns the sum of the return item's amount" do
+      expect(subject).to eq(amount * 2)
     end
   end
 
-  describe "#display_pre_tax_total" do
-    let(:customer_return) { Spree::CustomerReturn.new }
+  describe "#display_amount" do
+    let(:customer_return) { stub_model(Spree::CustomerReturn, amount: 21.22, currency: "RUB") }
 
     it "returns a Spree::Money" do
-      allow(customer_return).to receive_messages(pre_tax_total: 21.22)
-      expect(customer_return.display_pre_tax_total).to eq(Spree::Money.new(21.22))
+      expect(customer_return.display_amount).to eq(Spree::Money.new(21.22, currency: "RUB"))
     end
   end
 
@@ -159,7 +166,6 @@ describe Spree::CustomerReturn, :type => :model do
     let(:return_item)     { build(:return_item, inventory_unit: inventory_unit) }
 
     context "to the initial stock location" do
-
       it "should mark the received inventory units are returned" do
         create(:customer_return_without_return_items, return_items: [return_item], stock_location_id: inventory_unit.shipment.stock_location_id)
         return_item.receive!
@@ -189,7 +195,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 {
@@ -213,7 +219,6 @@ describe Spree::CustomerReturn, :type => :model do
     end
 
     context "it was not received" do
-
       before do
         return_item.update_attributes!(reception_status: "lost_in_transit")
       end
@@ -243,7 +248,6 @@ describe Spree::CustomerReturn, :type => :model do
     end
 
     context 'when all return items are decided' do
-
       context 'when all return items are rejected' do
         before { customer_return.return_items.each(&:reject!) }
 

data/spec/models/spree/exchange_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Exchange, :type => :model do
+  describe Exchange, type: :model do
     let(:order) { Spree::Order.new }
 
     let(:return_item_1) { build(:exchange_return_item) }
@@ -52,7 +52,7 @@ module Spree
 
       context "when it cannot create shipments for all items" do
         before do
-          StockItem.where(:variant_id => return_item.exchange_variant_id).destroy_all
+          StockItem.where(variant_id: return_item.exchange_variant_id).destroy_all
         end
 
         it 'raises an UnableToCreateShipments error' do
@@ -70,10 +70,5 @@ module Spree
     describe ".param_key" do # for dom_id
       it { expect(Exchange.param_key).to eq "spree_exchange" }
     end
-
-    describe ".model_name" do # for dom_id
-      it { expect(Exchange.model_name).to eq Spree::Exchange }
-    end
-
   end
 end