solidus_core 2.9.6 → 2.10.3

data/spec/models/spree/stock_quantities_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Spree::StockQuantities, type: :model do
 
   describe "#each" do
     def expect_each
-      expect { |b| subject.each(&b) }
+      expect { |item| subject.each(&item) }
     end
 
     context "with no items" do

data/spec/models/spree/store_credit_spec.rb

@@ -120,7 +120,7 @@ RSpec.describe Spree::StoreCredit do
       let!(:store_credit) { create(:store_credit) }
       let!(:test_category) { create(:store_credit_category, name: "Testing") }
 
-      subject { store_credit.update_attributes(category: test_category) }
+      subject { store_credit.update(category: test_category) }
 
       it "returns false" do
         expect(subject).to eq false
@@ -170,7 +170,7 @@ RSpec.describe Spree::StoreCredit do
       context "the authorized amount is defined" do
         let(:authorized_amount) { 15.00 }
 
-        before { store_credit.update_attributes(amount_authorized: authorized_amount) }
+        before { store_credit.update(amount_authorized: authorized_amount) }
 
         it "subtracts the authorized amount from the credited amount" do
           expect(store_credit.amount_remaining).to eq(store_credit.amount - authorized_amount)
@@ -181,7 +181,7 @@ RSpec.describe Spree::StoreCredit do
     context "the amount_used is defined" do
       let(:amount_used) { 10.0 }
 
-      before { store_credit.update_attributes(amount_used: amount_used) }
+      before { store_credit.update(amount_used: amount_used) }
 
       context "the authorized amount is not defined" do
         it "subtracts the amount used from the credited amount" do
@@ -192,7 +192,7 @@ RSpec.describe Spree::StoreCredit do
       context "the authorized amount is defined" do
         let(:authorized_amount) { 15.00 }
 
-        before { store_credit.update_attributes(amount_authorized: authorized_amount) }
+        before { store_credit.update(amount_authorized: authorized_amount) }
 
         it "subtracts the amount used and the authorized amount from the credited amount" do
           expect(store_credit.amount_remaining).to eq(store_credit.amount - amount_used - authorized_amount)
@@ -208,7 +208,7 @@ RSpec.describe Spree::StoreCredit do
       let(:originator) { nil }
 
       context "amount has not been authorized yet" do
-        before { store_credit.update_attributes(amount_authorized: authorization_amount) }
+        before { store_credit.update(amount_authorized: authorization_amount) }
 
         it "returns true" do
           expect(store_credit.authorize(store_credit.amount - authorization_amount, store_credit.currency)).to be_truthy
@@ -234,7 +234,7 @@ RSpec.describe Spree::StoreCredit do
       context "authorization has already happened" do
         let!(:auth_event) { create(:store_credit_auth_event, store_credit: store_credit) }
 
-        before { store_credit.update_attributes(amount_authorized: store_credit.amount) }
+        before { store_credit.update(amount_authorized: store_credit.amount) }
 
         it "returns true" do
           expect(store_credit.authorize(store_credit.amount, store_credit.currency, action_authorization_code: auth_event.authorization_code)).to be true
@@ -777,7 +777,7 @@ RSpec.describe Spree::StoreCredit do
           let!(:store_credits) do
             [
               create(:store_credit, user: user, amount: store_credit_amount),
-              create(:store_credit, user: user, amount: additional_store_credit_amount)
+              create(:store_credit, user: user.reload, amount: additional_store_credit_amount)
             ]
           end
 
@@ -816,7 +816,7 @@ RSpec.describe Spree::StoreCredit do
     context "amount is valid" do
       let(:amount) { 10.0 }
 
-      before { store_credit.update_attributes!(amount: 30.0) }
+      before { store_credit.update!(amount: 30.0) }
 
       it "returns true" do
         expect(subject).to eq true

data/spec/models/spree/tax_category_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Spree::TaxCategory, type: :model do
     end
 
     it "should undefault the previous default tax category" do
-      new_tax_category.update_attributes({ is_default: true })
+      new_tax_category.update({ is_default: true })
       expect(new_tax_category.is_default).to be true
 
       tax_category.reload

data/spec/models/spree/tax_rate_spec.rb

@@ -153,6 +153,7 @@ RSpec.describe Spree::TaxRate, type: :model do
 
     describe 'adjustments' do
       before do
+        expect(Spree::Deprecation).to receive(:warn)
         tax_rate.adjust(nil, item)
       end
 

data/spec/models/spree/taxon_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe Spree::Taxon, type: :model do
     context "updating a taxon permalink" do
       it 'parameterizes permalink correctly' do
         taxon.save!
-        taxon.update_attributes(permalink: 'spécial&charactèrs')
+        taxon.update(permalink: 'spécial&charactèrs')
         expect(taxon.permalink).to eql "special-characters"
       end
     end
@@ -51,7 +51,7 @@ RSpec.describe Spree::Taxon, type: :model do
 
       it 'parameterizes permalink correctly' do
         taxon.save!
-        taxon.update_attributes(permalink_part: 'spécial&charactèrs')
+        taxon.update(permalink_part: 'spécial&charactèrs')
         expect(taxon.reload.permalink).to eql "brands/special-characters"
       end
 

data/spec/models/spree/taxons/paperclip_attachment_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe "Spree::Taxon::PaperclipAttachment", type: :model do
+  describe "#destroy_attachment" do
+    let(:taxon) { create(:taxon) }
+
+    context "when trying to destroy a valid attachment definition" do
+      context "and taxon has a file attached " do
+        it "removes the attachment" do
+          taxon.update(icon: File.new(Rails.root.join('..', '..', 'spec', 'fixtures', 'thinking-cat.jpg')))
+          expect(taxon.destroy_attachment(:icon)).to be_truthy
+        end
+      end
+      context "and the taxon does not have any file attached yet" do
+        it "returns false" do
+          expect(taxon.destroy_attachment(:icon)).to be_falsey
+        end
+      end
+    end
+
+    context "when trying to destroy an invalid attachment" do
+      it 'returns false' do
+        expect(taxon.destroy_attachment(:foo)).to be_falsey
+      end
+    end
+  end
+end

data/spec/models/spree/unit_cancel_spec.rb

@@ -48,6 +48,11 @@ RSpec.describe Spree::UnitCancel do
       it "divides the line item total by the uncanceled units size" do
         expect(subject).to eq(-10.0)
       end
+
+      it "raises an error if dividing by 0" do
+        inventory_unit.cancel!
+        expect { subject }.to raise_error ZeroDivisionError, "Line Item does not have any inventory units available to cancel"
+      end
     end
 
     context "it is called with a line item that doesnt belong to the inventory unit" do

data/spec/models/spree/user_last_url_storer/rules/authentication_rule_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Spree::UserLastUrlStorer::Rules::AuthenticationRule do
+  describe '#match?' do
+    let(:login_path) { '/sign_in' }
+    let(:request) { double(fullpath: fullpath) }
+    let(:controller) do
+      double(
+        request: request,
+        spree_login_path: login_path,
+        controller_name: 'controller_double'
+      )
+    end
+
+    subject { described_class.match?(controller) }
+
+    context 'when the request full path is an authentication route' do
+      let!(:fullpath) { login_path }
+
+      it { is_expected.to be true }
+    end
+
+    context 'when the request full path is not an authentication route' do
+      let!(:fullpath) { '/products/baseball-cap' }
+
+      it { is_expected.to be false }
+    end
+  end
+end

data/spec/models/spree/user_last_url_storer_spec.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Spree::UserLastUrlStorer do
+  subject { described_class.new(controller) }
+
+  let(:fullpath) { '/products/baseball-cap' }
+  let(:session) { {} }
+  let(:request) { double(fullpath: fullpath) }
+  let(:controller) do
+    instance_double(
+      ApplicationController,
+      request: request,
+      session: session,
+      controller_name: 'app_controller_double'
+    )
+  end
+
+  module CustomRule
+    def self.match?(_controller)
+      true
+    end
+  end
+
+  after :each do
+    described_class.rules.delete('CustomRule')
+  end
+
+  describe '::rules' do
+    it 'includes default rules' do
+      rule = Spree::UserLastUrlStorer::Rules::AuthenticationRule
+      expect(described_class.rules).to include(rule)
+    end
+
+    it 'can add new rules' do
+      described_class.rules << CustomRule
+      expect(described_class.rules).to include(CustomRule)
+    end
+  end
+
+  describe '#store_location' do
+    context 'when at least one rule matches' do
+      it 'does not set the path value into the session' do
+        described_class.rules << CustomRule
+        subject.store_location
+        expect(session[:spree_user_return_to]).to be_nil
+      end
+    end
+
+    context 'when no rule matches' do
+      it 'sets the path value into the session' do
+        described_class.rules << CustomRule
+        described_class.rules.delete('CustomRule')
+        subject.store_location
+        expect(session[:spree_user_return_to]).to eql fullpath
+      end
+    end
+  end
+end

data/spec/models/spree/user_spec.rb

@@ -200,12 +200,12 @@ RSpec.describe Spree.user_class, type: :model do
       context "part of the store credit has been used" do
         let(:amount_used) { 35.00 }
 
-        before { store_credit.update_attributes(amount_used: amount_used) }
+        before { store_credit.update(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) }
+          before { additional_store_credit.update(amount_authorized: authorized_amount) }
 
           it "returns sum of amounts minus used amount and authorized amount" do
             expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount - amount_used - authorized_amount)
@@ -223,7 +223,7 @@ RSpec.describe Spree.user_class, type: :model 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) }
+          before { additional_store_credit.update(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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.10.3
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.3.x
+        version: 6.1.x
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -204,34 +204,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -309,9 +309,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -319,9 +316,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -356,14 +350,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 description: Essential models, mailers, and classes for the Solidus e-commerce project.
 email: contact@solidus.io
 executables: []
@@ -619,6 +613,8 @@ files:
 - app/models/spree/unit_cancel.rb
 - app/models/spree/user_address.rb
 - app/models/spree/user_class_handle.rb
+- app/models/spree/user_last_url_storer.rb
+- app/models/spree/user_last_url_storer/rules/authentication_rule.rb
 - app/models/spree/user_stock_location.rb
 - app/models/spree/validations/db_maximum_length_validator.rb
 - app/models/spree/variant.rb
@@ -656,6 +652,7 @@ files:
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
+- config/initializers/inflections.rb
 - config/initializers/money.rb
 - config/locales/en.yml
 - db/default/spree/countries.rb
@@ -741,6 +738,14 @@ files:
 - lib/spree/core/role_configuration.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/search/variant.rb
+- lib/spree/core/state_machines.rb
+- lib/spree/core/state_machines/inventory_unit.rb
+- lib/spree/core/state_machines/payment.rb
+- lib/spree/core/state_machines/reimbursement.rb
+- lib/spree/core/state_machines/return_authorization.rb
+- lib/spree/core/state_machines/return_item/acceptance_status.rb
+- lib/spree/core/state_machines/return_item/reception_status.rb
+- lib/spree/core/state_machines/shipment.rb
 - lib/spree/core/stock_configuration.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
@@ -981,7 +986,6 @@ files:
 - spec/mailers/promotion_code_batch_mailer_spec.rb
 - spec/mailers/reimbursement_mailer_spec.rb
 - spec/mailers/test_mailer_spec.rb
-- spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb
 - spec/models/spree/ability_spec.rb
 - spec/models/spree/address_spec.rb
 - spec/models/spree/adjustment_reason_spec.rb
@@ -1038,7 +1042,6 @@ files:
 - spec/models/spree/order/risk_assessment_spec.rb
 - spec/models/spree/order/state_machine_spec.rb
 - spec/models/spree/order/totals_spec.rb
-- spec/models/spree/order/updating_spec.rb
 - spec/models/spree/order/validations_spec.rb
 - spec/models/spree/order_cancellations_spec.rb
 - spec/models/spree/order_capturing_spec.rb
@@ -1186,7 +1189,10 @@ files:
 - spec/models/spree/tax_rate_spec.rb
 - spec/models/spree/taxon_spec.rb
 - spec/models/spree/taxonomy_spec.rb
+- spec/models/spree/taxons/paperclip_attachment_spec.rb
 - spec/models/spree/unit_cancel_spec.rb
+- spec/models/spree/user_last_url_storer/rules/authentication_rule_spec.rb
+- spec/models/spree/user_last_url_storer_spec.rb
 - spec/models/spree/user_spec.rb
 - spec/models/spree/validations/db_maximum_length_validator_spec.rb
 - spec/models/spree/variant/price_selector_spec.rb
@@ -1215,7 +1221,7 @@ homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1223,15 +1229,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []