spree_core 4.2.0.rc2 → 4.2.0.rc3

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,11 +1,16 @@
 class OrderWalkthrough
   def self.up_to(state)
-    # A default store must exist to provide store settings
-    store = Spree::Store.default || FactoryBot.create(:store, default: true)
+    store = if Spree::Store.exists?
+              # Ensure the default store is used
+              Spree::Store.default || FactoryBot.create(:store, default: true)
+            else
+              # Create a default store
+              FactoryBot.create(:store, default: true)
+            end
 
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
-      FactoryBot.create(:check_payment_method)
+      FactoryBot.create(:check_payment_method, stores: [store])
     end
 
     # Need to create a valid zone too...

data/lib/spree/testing_support/rspec_retry_config.rb

@@ -0,0 +1,10 @@
+require 'rspec/retry'
+
+RSpec.configure do |config|
+  config.verbose_retry = true
+  config.display_try_failure_messages = true
+
+  config.around :each, type: :feature do |ex|
+    ex.run_with_retry retry: ENV.fetch('RSPEC_RETRY_RETRY_COUNT', 3).to_i
+  end
+end

data/spree_core.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemerchant', '~> 1.67'
   s.add_dependency 'acts_as_list', '~> 0.8'
-  s.add_dependency 'awesome_nested_set', '>= 3.1.4', '< 3.3.0'
+  s.add_dependency 'awesome_nested_set', '>= 3.3.1', '< 4.0'
   s.add_dependency 'carmen', '>= 1.0', '< 1.2'
   s.add_dependency 'cancancan', '~> 3.0'
   s.add_dependency 'ffaker', '~> 2.9'
@@ -39,9 +39,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 6.0.0'
-  s.add_dependency 'ransack', '~> 2.3.0'
+  s.add_dependency 'rails', '>= 6.0', '< 6.2'
+  s.add_dependency 'ransack', '>= 2.3', '< 2.5'
   s.add_dependency 'responders'
+  s.add_dependency 'rexml'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc2
+  version: 4.2.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -45,20 +45,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -215,30 +215,42 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +265,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -422,6 +448,7 @@ files:
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
 - app/finders/spree/addresses/find.rb
+- app/finders/spree/base_finder.rb
 - app/finders/spree/countries/find.rb
 - app/finders/spree/credit_cards/find.rb
 - app/finders/spree/line_items/find_by_variant.rb
@@ -579,7 +606,7 @@ files:
 - app/models/spree/return_item/eligibility_validator/inventory_shipped.rb
 - app/models/spree/return_item/eligibility_validator/no_reimbursements.rb
 - app/models/spree/return_item/eligibility_validator/order_completed.rb
-- app/models/spree/return_item/eligibility_validator/r_m_a_required.rb
+- app/models/spree/return_item/eligibility_validator/rma_required.rb
 - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_product.rb
@@ -635,8 +662,8 @@ files:
 - app/presenters/spree/variant_presenter.rb
 - app/presenters/spree/variants/option_types_presenter.rb
 - app/presenters/spree/variants/options_presenter.rb
-- app/services/spree/account/addresses/base.rb
 - app/services/spree/account/addresses/create.rb
+- app/services/spree/account/addresses/helper.rb
 - app/services/spree/account/addresses/update.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
@@ -655,6 +682,7 @@ files:
 - app/services/spree/checkout/update.rb
 - app/services/spree/compare_line_items.rb
 - app/services/spree/generate_token.rb
+- app/sorters/spree/base_sorter.rb
 - app/sorters/spree/orders/sort.rb
 - app/sorters/spree/products/sort.rb
 - app/validators/db_maximum_length_validator.rb
@@ -686,8 +714,10 @@ files:
 - config/initializers/active_storage.rb
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
+- config/initializers/inflections.rb
 - config/initializers/premailer_assets.rb
 - config/initializers/premailer_rails.rb
+- config/initializers/rails61_fixes.rb
 - config/initializers/state_machine.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -979,6 +1009,11 @@ files:
 - db/migrate/20201006110150_add_checkout_zone_field_to_store.rb
 - db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb
 - db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb
+- db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb
+- db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb
+- db/migrate/20210114182625_create_spree_payment_methods_stores.rb
+- db/migrate/20210114220232_migrate_data_payment_methods_stores.rb
+- db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -1038,8 +1073,6 @@ files:
 - lib/spree/database_type_utilities.rb
 - lib/spree/dependencies_helper.rb
 - lib/spree/i18n.rb
-- lib/spree/i18n/base.rb
-- lib/spree/i18n/initializer.rb
 - lib/spree/localized_number.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
@@ -1111,6 +1144,7 @@ files:
 - lib/spree/testing_support/kernel.rb
 - lib/spree/testing_support/order_walkthrough.rb
 - lib/spree/testing_support/preferences.rb
+- lib/spree/testing_support/rspec_retry_config.rb
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
@@ -1130,9 +1164,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc3
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc2
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1148,7 +1182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.

data/lib/spree/i18n/base.rb

@@ -1,17 +0,0 @@
-module Spree
-  module ViewContext
-    def self.context=(context)
-      @context = context
-    end
-
-    def self.context
-      @context
-    end
-
-    def view_context
-      super.tap do |context|
-        Spree::ViewContext.context = context
-      end
-    end
-  end
-end

data/lib/spree/i18n/initializer.rb

@@ -1 +0,0 @@
-Spree::BaseController.include Spree::ViewContext