solidus_core 2.10.0.beta1 → 2.10.0

data/spec/models/spree/stock/splitter/base_spec.rb

@@ -9,12 +9,12 @@ module Spree
         let(:stock_location) { mock_model(Spree::StockLocation) }
 
         it 'continues to splitter chain' do
-          splitter1 = Base.new(stock_location)
-          splitter2 = Base.new(stock_location, splitter1)
+          splitter_one = Base.new(stock_location)
+          splitter_two = Base.new(stock_location, splitter_one)
           packages = []
 
-          expect(splitter1).to receive(:split).with(packages)
-          splitter2.split(packages)
+          expect(splitter_one).to receive(:split).with(packages)
+          splitter_two.split(packages)
         end
       end
     end

data/spec/models/spree/stock/splitter/shipping_category_spec.rb

@@ -29,15 +29,15 @@ module Spree
       subject { described_class.new(stock_location) }
 
       it 'splits each package by shipping category' do
-        package1 = Package.new(stock_location)
-        4.times { package1.add inventory_unit1 }
-        8.times { package1.add inventory_unit2 }
+        package_one = Package.new(stock_location)
+        4.times { package_one.add inventory_unit1 }
+        8.times { package_one.add inventory_unit2 }
 
-        package2 = Package.new(stock_location)
-        6.times { package2.add inventory_unit1 }
-        9.times { package2.add inventory_unit2, :backordered }
+        package_two = Package.new(stock_location)
+        6.times { package_two.add inventory_unit1 }
+        9.times { package_two.add inventory_unit2, :backordered }
 
-        packages = subject.split([package1, package2])
+        packages = subject.split([package_one, package_two])
         expect(packages[0].quantity).to eq 4
         expect(packages[1].quantity).to eq 8
         expect(packages[2].quantity).to eq 6

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

@@ -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
 

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/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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.10.0.beta1
+  version: 2.10.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -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
@@ -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
@@ -742,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 +985,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 +1041,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 +1188,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
@@ -1223,14 +1228,14 @@ 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.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.

data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb

@@ -1,162 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-require Spree::Core::Engine.root.join('db/migrate/20190106184413_remove_code_from_spree_promotions.rb')
-
-RSpec.describe RemoveCodeFromSpreePromotions do
-  let(:migrations_paths) { ActiveRecord::Migrator.migrations_paths }
-  let(:migrations) do
-    if Rails.gem_version >= Gem::Version.new('6.0.0')
-      ActiveRecord::MigrationContext.new(
-        migrations_paths,
-        ActiveRecord::SchemaMigration
-      ).migrations
-    elsif Rails.gem_version >= Gem::Version.new('5.2.0')
-      ActiveRecord::MigrationContext.new(migrations_paths).migrations
-    else
-      ActiveRecord::Migrator.migrations(migrations_paths)
-    end
-  end
-  let(:previous_version) { 20180710170104 }
-  let(:current_version) { 20190106184413 }
-
-  subject do
-    if Rails.gem_version >= Gem::Version.new('6.0.0')
-      ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, current_version).migrate
-    else
-      ActiveRecord::Migrator.new(:up, migrations, current_version).migrate
-    end
-  end
-
-  # This is needed for MySQL since it is not able to rollback to the previous
-  # state when database schema changes within that transaction.
-  before(:all) { self.use_transactional_tests = false }
-  after(:all)  { self.use_transactional_tests = true }
-
-  around do |example|
-    DatabaseCleaner.clean_with(:truncation)
-    # Silence migrations output in specs report.
-    ActiveRecord::Migration.suppress_messages do
-      # Migrate back to the previous version
-      if Rails.gem_version >= Gem::Version.new('6.0.0')
-        ActiveRecord::Migrator.new(:down, migrations, ActiveRecord::SchemaMigration, previous_version).migrate
-      else
-        ActiveRecord::Migrator.new(:down, migrations, previous_version).migrate
-      end
-      # If other tests using Spree::Promotion ran before this one, Rails has
-      # stored information about table's columns and we need to reset those
-      # since the migration changed the database structure.
-      Spree::Promotion.reset_column_information
-
-      example.run
-
-      # Re-update column information after the migration has been executed
-      # again in the example. This will make the promotion attributes cache
-      # ready for other tests.
-      Spree::Promotion.reset_column_information
-    end
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
-  let(:promotion_with_code) { create(:promotion) }
-
-  before do
-    # We can't set code via factory since `code=` is currently raising
-    # an error, see more at:
-    # https://github.com/solidusio/solidus/blob/cf96b03eb9e80002b69736e082fd485c870ab5d9/core/app/models/spree/promotion.rb#L65
-    promotion_with_code.update_column(:code, code)
-  end
-
-  context 'when there are no promotions with code' do
-    let(:code) { '' }
-
-    it 'does not call any promotion with code handler' do
-      expect(described_class).not_to receive(:promotions_with_code_handler)
-
-      subject
-    end
-  end
-
-  context 'when there are promotions with code' do
-    let(:code) { 'Just An Old Promo Code' }
-
-    context 'with the deafult handler (Solidus::Migrations::PromotionWithCodeHandlers::RaiseException)' do
-      it 'raise a StandardError exception' do
-        expect { subject }.to raise_error(StandardError)
-      end
-    end
-
-    context 'changing the default handler' do
-      before do
-        allow(described_class)
-          .to receive(:promotions_with_code_handler)
-          .and_return(promotions_with_code_handler)
-      end
-
-      context 'to Solidus::Migrations::PromotionWithCodeHandlers::MoveToSpreePromotionCode' do
-        let(:promotions_with_code_handler) { Solidus::Migrations::PromotionWithCodeHandlers::MoveToSpreePromotionCode }
-
-        context 'when there are no Spree::PromotionCode with the same value' do
-          it 'moves the code into a Spree::PromotionCode' do
-            migration_context = double('a migration context')
-            allow_any_instance_of(promotions_with_code_handler)
-              .to receive(:migration_context)
-              .and_return(migration_context)
-
-            expect(migration_context)
-              .to receive(:say)
-              .with("Creating Spree::PromotionCode with value 'just an old promo code' for Spree::Promotion with id '#{promotion_with_code.id}'")
-
-            expect { subject }
-              .to change { Spree::PromotionCode.all.size }
-              .from(0)
-              .to(1)
-          end
-        end
-
-        context 'with promotions with type set (legacy feature)' do
-          let(:promotion_with_code) { create(:promotion, type: 'Spree::Promotion') }
-
-          it 'does not raise a STI error' do
-            expect { subject }.not_to raise_error
-          end
-        end
-
-        context 'when there is a Spree::PromotionCode with the same value' do
-          context 'associated with the same promotion' do
-            let!(:existing_promotion_code) { create(:promotion_code, value: 'just an old promo code', promotion: promotion_with_code) }
-
-            it 'does not create a new Spree::PromotionCode' do
-              expect { subject }.not_to change { Spree::PromotionCode.all.size }
-            end
-          end
-
-          context 'associated with another promotion' do
-            let!(:existing_promotion_code) { create(:promotion_code, value: 'just an old promo code') }
-
-            it 'raises an exception' do
-              expect { subject }.to raise_error(StandardError)
-            end
-          end
-        end
-      end
-
-      context 'to Solidus::Migrations::PromotionWithCodeHandlers::DoNothing' do
-        let(:promotions_with_code_handler) { Solidus::Migrations::PromotionWithCodeHandlers::DoNothing }
-
-        it 'just prints a message' do
-          migration_context = double('a migration context')
-          allow_any_instance_of(promotions_with_code_handler)
-            .to receive(:migration_context)
-            .and_return(migration_context)
-
-          expect(migration_context)
-            .to receive(:say)
-            .with("Code 'Just An Old Promo Code' is going to be removed from Spree::Promotion with id '#{promotion_with_code.id}'")
-
-          subject
-        end
-      end
-    end
-  end
-end