solidus_core 2.9.5 → 2.10.2

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.5
+  version: 2.10.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-07-16 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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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: 7.0.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
@@ -971,6 +976,7 @@ files:
 - spec/lib/spree/migrations_spec.rb
 - spec/lib/spree/money_spec.rb
 - spec/lib/spree/permission_sets/default_customer_spec.rb
+- spec/lib/spree/permitted_attributes_spec.rb
 - spec/lib/spree/promo/environment_spec.rb
 - spec/lib/tasks/dummy_task.rake
 - spec/lib/tasks/dummy_task_spec.rb
@@ -980,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
@@ -1037,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
@@ -1185,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
@@ -1222,7 +1229,7 @@ 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:
   - - ">="

data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb

@@ -1,148 +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 ActiveRecord::Base.connection.respond_to?(:migration_context)
-      # Rails >= 5.2
-      ActiveRecord::MigrationContext.new(migrations_paths).migrations
-    else
-      ActiveRecord::Migrator.migrations(migrations_paths)
-    end
-  end
-  let(:previous_version) { 20180710170104 }
-  let(:current_version) { 20190106184413 }
-
-  subject { ActiveRecord::Migrator.new(:up, migrations, current_version).migrate }
-
-  # 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
-      ActiveRecord::Migrator.new(:down, migrations, previous_version).migrate
-      # 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