solidus_core 2.9.0 → 2.10.0

data/solidus_core.gemspec

@@ -17,27 +17,27 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.required_ruby_version     = '>= 2.2.2'
+  s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.1', '< 5.3.x']
+    s.add_dependency rails_dep, ['>= 5.1', '< 7.0.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '~> 0.3'
-  s.add_dependency 'awesome_nested_set', '~> 3.0', '>= 3.0.1'
-  s.add_dependency 'cancancan', '~> 2.2'
+  s.add_dependency 'awesome_nested_set', '~> 3.2'
+  s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
   s.add_dependency 'carmen', '~> 1.1.0'
   s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'paperclip', ['>= 4.2', '< 6']
+  s.add_dependency 'paperclip', '>= 4.2'
   s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'ransack', '~> 2.0'
-  s.add_dependency 'state_machines-activerecord', '~> 0.4'
+  s.add_dependency 'state_machines-activerecord', '~> 0.6'
 end

data/spec/lib/search/base_spec.rb

@@ -60,7 +60,11 @@ RSpec.describe Spree::Core::Search::Base do
                search: { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] } }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
-    expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
+      expect(searcher.send(:get_base_scope).to_sql).to match /between 10\.0 and 15\.0/i
+    else
+      expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
+    end
     expect(searcher.retrieve_products.count).to eq(2)
   end
 

data/spec/lib/search/variant_spec.rb

@@ -85,7 +85,7 @@ module Spree
           example.run
           described_class.search_terms = search_terms
         end
-        before { variant.update_attributes!(weight: 5000) }
+        before { variant.update!(weight: 5000) }
 
         it { assert_found("5000", variant) }
       end

data/spec/lib/spree/core/environment_extension_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'spree/core/environment_extension'
 
 RSpec.describe Spree::Core::EnvironmentExtension do
-  let(:base) { Class.new }
+  let(:base) { Class.new { def self.to_s; 'ExampleClass'; end } }
   subject! { base.include(described_class).new }
 
   describe '.add_class_set' do
@@ -32,4 +32,15 @@ RSpec.describe Spree::Core::EnvironmentExtension do
       end
     end
   end
+
+  describe '#add_class' do
+    it 'is deprecated' do
+      expect(Spree::Deprecation).to receive(:warn) do |message, _caller|
+        expect(message).to include('ExampleClass.add_class_set(:foo)')
+      end
+      expect(base).to receive(:add_class_set).with(:foo)
+
+      base.new.add_class(:foo)
+    end
+  end
 end

data/spec/lib/spree/core/stock_configuration_spec.rb

@@ -39,6 +39,24 @@ RSpec.describe Spree::Core::StockConfiguration do
     end
   end
 
+  describe '#location_filter_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.location_filter_class }
+
+    it "returns Spree::Stock::LocationFilter::Active" do
+      is_expected.to be ::Spree::Stock::LocationFilter::Active
+    end
+
+    context "with another constant name assiged" do
+      MyFilter = Class.new
+      before { stock_configuration.location_filter_class = MyFilter.to_s }
+
+      it "returns the constant" do
+        is_expected.to be MyFilter
+      end
+    end
+  end
+
   describe '#location_sorter_class' do
     let(:stock_configuration) { described_class.new }
     subject { stock_configuration.location_sorter_class }
@@ -56,4 +74,22 @@ RSpec.describe Spree::Core::StockConfiguration do
       end
     end
   end
+
+  describe '#allocator_class' do
+    let(:stock_configuration) { described_class.new }
+    subject { stock_configuration.allocator_class }
+
+    it "returns Spree::Stock::Allocator::OnHandFirst" do
+      is_expected.to be ::Spree::Stock::Allocator::OnHandFirst
+    end
+
+    context "with another constant name assiged" do
+      MyAllocator = Class.new
+      before { stock_configuration.allocator_class = MyAllocator.to_s }
+
+      it "returns the constant" do
+        is_expected.to be MyAllocator
+      end
+    end
+  end
 end

data/spec/lib/spree/core/validators/email_spec.rb

@@ -12,27 +12,27 @@ RSpec.describe Spree::EmailValidator do
 
   let(:valid_emails) {
     [
-    'valid@email.com',
-    'valid@email.com.uk',
-    'e@email.com',
-    'valid+email@email.com',
-    'valid-email@email.com',
-    'valid_email@email.com',
-    'valid.email@email.com'
-  ]
+      'valid@email.com',
+      'valid@email.com.uk',
+      'e@email.com',
+      'valid+email@email.com',
+      'valid-email@email.com',
+      'valid_email@email.com',
+      'valid.email@email.com'
+    ]
   }
   let(:invalid_emails) {
     [
-    'invalid email@email.com',
-    '.invalid.email@email.com',
-    'invalid.email.@email.com',
-    '@email.com',
-    '.@email.com',
-    'invalidemailemail.com',
-    '@invalid.email@email.com',
-    'invalid@email@email.com',
-    'invalid.email@@email.com'
-  ]
+      'invalid email@email.com',
+      '.invalid.email@email.com',
+      'invalid.email.@email.com',
+      '@email.com',
+      '.@email.com',
+      'invalidemailemail.com',
+      '@invalid.email@email.com',
+      'invalid@email@email.com',
+      'invalid.email@@email.com'
+    ]
   }
 
   it 'validates valid email addresses' do

data/spec/lib/spree/event_spec.rb

@@ -18,14 +18,26 @@ RSpec.describe Spree::Event do
     before do
       # ActiveSupport::Notifications does not provide an interface to clean all
       # subscribers at once, so some low level brittle code is required
-      @old_subscribers = notifier.instance_variable_get('@subscribers').dup
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        @old_string_subscribers = notifier.instance_variable_get('@string_subscribers').dup
+        @old_other_subscribers = notifier.instance_variable_get('@other_subscribers').dup
+        notifier.instance_variable_get('@string_subscribers').clear
+        notifier.instance_variable_get('@other_subscribers').clear
+      else
+        @old_subscribers = notifier.instance_variable_get('@subscribers').dup
+        notifier.instance_variable_get('@subscribers').clear
+      end
       @old_listeners = notifier.instance_variable_get('@listeners_for').dup
-      notifier.instance_variable_get('@subscribers').clear
       notifier.instance_variable_get('@listeners_for').clear
     end
 
     after do
-      notifier.instance_variable_set '@subscribers', @old_subscribers
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        notifier.instance_variable_set '@string_subscribers', @old_string_subscribers
+        notifier.instance_variable_set '@other_subscribers', @old_other_subscribers
+      else
+        notifier.instance_variable_set '@subscribers', @old_subscribers
+      end
       notifier.instance_variable_set '@listeners_for', @old_listeners
     end
 

data/spec/models/spree/address_spec.rb

@@ -152,6 +152,29 @@ RSpec.describe Spree::Address, type: :model do
         it "sets up a new record with Spree::Config[:default_country_iso]" do
           expect(Spree::Address.build_default.country).to eq default_country
         end
+
+        it 'accepts other attributes' do
+          address = Spree::Address.build_default(first_name: 'Ryan')
+
+          expect(address.country).to eq default_country
+          expect(address.first_name).to eq 'Ryan'
+        end
+
+        it 'accepts a block' do
+          address = Spree::Address.build_default do |record|
+            record.first_name = 'Ryan'
+          end
+
+          expect(address.country).to eq default_country
+          expect(address.first_name).to eq 'Ryan'
+        end
+
+        it 'can override the country' do
+          another_country = build :country
+          address = Spree::Address.build_default(country: another_country)
+
+          expect(address.country).to eq another_country
+        end
       end
 
       # Regression test for https://github.com/spree/spree/issues/1142

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

@@ -36,7 +36,7 @@ RSpec.describe Spree::Calculator::Returns::DefaultRefundAmount, type: :model do
           source_type: 'Spree::Order'
         )
 
-        order.adjustments.first.update_attributes(amount: adjustment_amount)
+        order.adjustments.first.update(amount: adjustment_amount)
       end
 
       it 'will return the line item amount deducted of refund' do

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

@@ -25,7 +25,7 @@ module Spree
         )
       end
 
-      subject { FlatPercentItemTotal.new(preferred_flat_percent: 10) }
+      subject { described_class.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

@@ -6,7 +6,7 @@ require 'shared_examples/calculator_shared_examples'
 module Spree
   module Calculator::Shipping
     RSpec.describe FlatRate, type: :model do
-      subject { Calculator::Shipping::FlatRate.new(preferred_amount: 4.00) }
+      subject { described_class.new(preferred_amount: 4.00) }
 
       it_behaves_like 'a calculator with a description'
 

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

@@ -15,7 +15,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 4, variant2 => 6 })
       end
 
-      let(:subject) { FlexiRate.new }
+      let(:subject) { described_class.new }
 
       context "compute" do
         it "should compute amount correctly when all fees are 0" do
@@ -46,7 +46,7 @@ module Spree
         end
 
         it "should allow creation of new object with all the attributes" do
-          FlexiRate.new(preferred_first_item: 1,
+          described_class.new(preferred_first_item: 1,
                         preferred_additional_item: 1,
                         preferred_max_items: 1)
         end

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

@@ -15,7 +15,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 5, variant2 => 3 })
       end
 
-      subject { PerItem.new(preferred_amount: 10) }
+      subject { described_class.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

@@ -5,7 +5,7 @@ require 'shared_examples/calculator_shared_examples'
 
 RSpec.describe Spree::Calculator::Shipping::PriceSack, type: :model do
   let(:calculator) do
-    calculator = Spree::Calculator::PriceSack.new
+    calculator = described_class.new
     calculator.preferred_minimal_amount = 5
     calculator.preferred_normal_amount = 10
     calculator.preferred_discount_amount = 1
@@ -14,22 +14,31 @@ RSpec.describe Spree::Calculator::Shipping::PriceSack, type: :model do
 
   it_behaves_like 'a calculator with a description'
 
-  let(:order) { stub_model(Spree::Order) }
-  let(:shipment) { stub_model(Spree::Shipment, amount: 10) }
+  describe '#compute' do
+    subject { calculator.compute(package) }
+    let(:package) { build(:stock_package, variants_contents: { build(:variant) => 1 }) }
 
-  # 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
-    calculator.compute(order)
-  end
+    before do
+      # This hack is due to our factories not being so smart to understand
+      # that they should create line items with the price of the associated
+      # variant by default.
+      allow_any_instance_of(Spree::Stock::ContentItem).to receive(:price) { amount }
+    end
 
-  # Regression test for https://github.com/spree/spree/issues/1156
-  it "computes with a shipment object" do
-    calculator.compute(shipment)
-  end
+    context 'when price < minimal amount' do
+      let(:amount) { 2 }
+
+      it "returns the discounted amount" do
+        expect(subject).to eq(10)
+      end
+    end
+
+    context 'when price > minimal amount' do
+      let(:amount) { 6 }
 
-  # Regression test for https://github.com/spree/spree/issues/2055
-  it "computes the correct amount" do
-    expect(calculator.compute(2)).to eq(calculator.preferred_normal_amount)
-    expect(calculator.compute(6)).to eq(calculator.preferred_discount_amount)
+      it "returns the discounted amount" do
+        expect(subject).to eq(1)
+      end
+    end
   end
 end

data/spec/models/spree/carton_spec.rb

@@ -5,6 +5,14 @@ require 'rails_helper'
 RSpec.describe Spree::Carton do
   let(:carton) { create(:carton) }
 
+  describe 'shipping method' do
+    it 'returns soft deleted shipping method' do
+      carton = create(:carton)
+      carton.shipping_method.discard
+      expect(carton.reload.shipping_method).to be_present
+    end
+  end
+
   describe "#create" do
     subject { carton }
 
@@ -73,8 +81,8 @@ RSpec.describe Spree::Carton do
     let(:email) { 'something@something.com' }
 
     before do
-      first_order.update_attributes!(email: email)
-      second_order.update_attributes!(email: email)
+      first_order.update!(email: email)
+      second_order.update!(email: email)
     end
 
     it "returns a unique list of the order emails it is associated to" do

data/spec/models/spree/classification_spec.rb

@@ -34,9 +34,21 @@ module Spree
 
     context "removing product from taxon" do
       before :each do
-        p = taxon_with_5_products.products[1]
-        expect(p.classifications.first.position).to eq(2)
-        taxon_with_5_products.products.destroy(p)
+        element = taxon_with_5_products.products[1]
+        expect(element.classifications.first.position).to eq(2)
+        taxon_with_5_products.products.destroy(element)
+      end
+
+      it "resets positions" do
+        expect positions_to_be_valid(taxon_with_5_products)
+      end
+    end
+
+    context "Discard'ing a product" do
+      before :each do
+        element = taxon_with_5_products.products[1]
+        expect(element.classifications.first.position).to eq(2)
+        element.discard
       end
 
       it "resets positions" do
@@ -59,9 +71,9 @@ module Spree
 
     context "removing taxon from product" do
       before :each do
-        p = taxon_with_5_products.products[1]
-        p.taxons.destroy(taxon_with_5_products)
-        p.save!
+        element = taxon_with_5_products.products[1]
+        element.taxons.destroy(taxon_with_5_products)
+        element.save!
       end
 
       it "resets positions" do
@@ -71,9 +83,9 @@ module Spree
 
     context "replacing product's taxons" do
       before :each do
-        p = taxon_with_5_products.products[1]
-        p.taxons = []
-        p.save!
+        element = taxon_with_5_products.products[1]
+        element.taxons = []
+        element.save!
       end
 
       it "resets positions" do

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

@@ -77,7 +77,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 { |value| value[:first_name] = "Newbie" } }
 
             subject { user.save_in_address_book(updated_address_attributes, true) }
 
@@ -104,7 +104,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 { |value| value[:firstname] = "Johnny" }
         end
 
         before do
@@ -191,8 +191,8 @@ module Spree
 
           it "archives address2" do
             subject
-            user_address2 = user.user_addresses.all_historical.find_by(address_id: address2.id)
-            expect(user_address2.archived).to be true
+            user_address_two = user.user_addresses.all_historical.find_by(address_id: address2.id)
+            expect(user_address_two.archived).to be true
           end
 
           context "via a new address that matches an archived one" do

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

@@ -62,7 +62,7 @@ RSpec.describe Spree::UserMethods do
 
   describe '#available_store_credit_total' do
     subject do
-      test_user.available_store_credit_total(currency: 'USD')
+      test_user.reload.available_store_credit_total(currency: 'USD')
     end
 
     context 'when the user does not have any credit' do
@@ -76,25 +76,26 @@ RSpec.describe Spree::UserMethods do
       it { is_expected.to eq(100 + 200) }
 
       context 'when some has been used' do
-        before { credit_1.update_attributes!(amount_used: 35) }
+        before { credit_1.update!(amount_used: 35) }
 
         it { is_expected.to eq(100 + 200 - 35) }
 
         context 'when some has been authorized' do
-          before { credit_1.update_attributes!(amount_authorized: 10) }
+          before { credit_1.update!(amount_authorized: 10) }
 
           it { is_expected.to eq(100 + 200 - 35 - 10) }
         end
       end
 
       context 'when some has been authorized' do
-        before { credit_1.update_attributes!(amount_authorized: 10) }
+        before { credit_1.update!(amount_authorized: 10) }
 
         it { is_expected.to eq(100 + 200 - 10) }
       end
 
       context 'with credits of multiple currencies' do
         let!(:credit_3) { create(:store_credit, user: test_user, amount: 400, currency: 'GBP') }
+        before { test_user.reload }
 
         it 'separates the currencies' do
           expect(test_user.available_store_credit_total(currency: 'USD')).to eq(100 + 200)

data/spec/models/spree/credit_card_spec.rb

@@ -109,10 +109,10 @@ RSpec.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({ 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 })
+      persisted_card.update({ address_attributes: updated_attributes })
       expect(persisted_card.address.address1).to eq "123 Main St."
     end
   end

data/spec/models/spree/customer_return_spec.rb

@@ -233,7 +233,7 @@ RSpec.describe Spree::CustomerReturn, type: :model do
 
     context "it was not received" do
       before do
-        return_item.update_attributes!(reception_status: "lost_in_transit")
+        return_item.update!(reception_status: "lost_in_transit")
       end
 
       it 'should not updated inventory unit to returned' do

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

@@ -456,7 +456,7 @@ RSpec.describe Spree::Order, type: :model do
         order.line_items << FactoryBot.create(:line_item)
         order.line_items.first.variant.stock_items.each do |si|
           si.set_count_on_hand(0)
-          si.update_attributes(backorderable: false)
+          si.update(backorderable: false)
         end
 
         Spree::OrderUpdater.new(order).update

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

@@ -16,7 +16,7 @@ RSpec.describe "Outstanding balance integration tests" do
   let!(:order) { create(:order_with_line_items, line_items_count: 2, line_items_price: 3, shipment_cost: 13) }
   let(:item_1) { order.line_items[0] }
   let(:item_2) { order.line_items[1] }
-  before { order.update_attributes!(state: 'complete', completed_at: Time.now) }
+  before { order.update!(state: 'complete', completed_at: Time.now) }
 
   subject do
     order.reload
@@ -44,11 +44,11 @@ RSpec.describe "Outstanding balance integration tests" do
     end
 
     context 'when the order is cancelled' do
-      before { order.update_attributes!(state: "canceled") }
+      before { order.update!(state: "canceled") }
       it { should eq(-19) }
 
       context 'and the payment is voided' do
-        before { payment.update_attributes!(state: "void") }
+        before { payment.update!(state: "void") }
         it { should eq 0 }
       end
 
@@ -116,11 +116,11 @@ RSpec.describe "Outstanding balance integration tests" do
     end
 
     context 'when the order is cancelled' do
-      before { order.update_attributes!(state: "canceled") }
+      before { order.update!(state: "canceled") }
       it { should eq(-10) }
 
       context 'and the payment is voided' do
-        before { payment.update_attributes!(state: "void") }
+        before { payment.update!(state: "void") }
         it { should eq 0 }
       end
 

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

@@ -213,7 +213,7 @@ module Spree
         end
 
         context "for canceled orders" do
-          before { order.update_attributes(state: 'canceled') }
+          before { order.update(state: 'canceled') }
 
           it "it should be zero" do
             expect(order.total).to eq(110)

data/spec/models/spree/order_contents_spec.rb

@@ -134,7 +134,7 @@ RSpec.describe Spree::OrderContents, type: :model do
 
       context 'when the order does not have a taxable address' do
         before do
-          order.update_attributes!(ship_address: nil, bill_address: nil)
+          order.update!(ship_address: nil, bill_address: nil)
           expect(order.tax_address.country_id).to be_nil
         end
 

data/spec/models/spree/order_inventory_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
     let(:new_quantity) { 3 }
 
     before do
-      line_item.update_attributes!(quantity: old_quantity)
+      line_item.update!(quantity: old_quantity)
 
       line_item.update_column(:quantity, new_quantity)
       subject.line_item.reload
@@ -86,7 +86,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
     end
 
     context "variant doesnt track inventory" do
-      before { variant.update_attributes!(track_inventory: false) }
+      before { variant.update!(track_inventory: false) }
       let(:new_quantity) { 1 }
 
       it "creates on hand inventory units" do
@@ -164,7 +164,7 @@ RSpec.describe Spree::OrderInventory, type: :model do
     let(:new_quantity) { 2 }
 
     before do
-      line_item.update_attributes!(quantity: old_quantity)
+      line_item.update!(quantity: old_quantity)
 
       line_item.update_column(:quantity, new_quantity)
       subject.line_item.reload

data/spec/models/spree/order_merger_spec.rb

@@ -77,13 +77,13 @@ module Spree
 
       context "2 equal line items" do
         before do
-          @line_item_1 = order_1.contents.add(variant, 1, foos: {})
-          @line_item_2 = order_2.contents.add(variant, 1, foos: {})
+          @line_item_one = order_1.contents.add(variant, 1, foos: {})
+          @line_item_two = order_2.contents.add(variant, 1, foos: {})
         end
 
         specify do
           without_partial_double_verification do
-            expect(order_1).to receive(:foos_match).with(@line_item_1, kind_of(Hash)).and_return(true)
+            expect(order_1).to receive(:foos_match).with(@line_item_one, kind_of(Hash)).and_return(true)
           end
           subject.merge!(order_2)
           expect(order_1.line_items.count).to eq(1)

data/spec/models/spree/order_shipping_spec.rb

@@ -181,7 +181,7 @@ RSpec.describe Spree::OrderShipping do
     # OrderShipping#ship rather than vice versa
     context "when the tracking number is already on the shipment" do
       before do
-        shipment.update_attributes!(tracking: 'tracking-number')
+        shipment.update!(tracking: 'tracking-number')
       end
 
       it "sets the tracking-number" do