spree_core 4.2.0.rc1 → 4.2.0

data/lib/spree/testing_support/i18n.rb

@@ -84,7 +84,7 @@ RSpec.configure do |config|
       end
 
       Spree.check_unused_translations
-      if false && Spree.unused_translation_messages.any?
+      if Spree.unused_translation_messages.any?
         puts "\nThere are unused translations within Spree:"
         puts Spree.unused_translation_messages.sort
         exit(1)

data/lib/spree/testing_support/locale_helpers.rb

@@ -0,0 +1,71 @@
+module Spree
+  module TestingSupport
+    module LocaleHelpers
+      # rubocop:disable Layout/ArgumentAlignment
+      def add_french_locales
+        I18n.backend.store_translations(:fr,
+          spree: {
+            added_to_cart: 'Ajouté au panier avec succès!',
+            continue_shopping: 'Continuer vos achats',
+            choose_currency: 'Choisir la devise',
+            internationalization: 'Internationalisation',
+            i18n: {
+              language: 'Langue',
+              this_file_language: 'Français (FR)'
+            },
+            cart_page: {
+              header: 'Votre panier',
+              empty_info: 'Votre panier est vide',
+              add_promo_code: 'AJOUTER UN CODE PROMOTIONNEL',
+              checkout: 'Passer la commande',
+              product: 'articles',
+              quantity: 'quantité',
+              title: 'Panier',
+              change_quantity: 'Changer la quantité',
+              remove_from_cart: 'Retirer du panier'
+            },
+            shopping_cart: 'Panier',
+            cart: 'Panier',
+            close: 'Fermer',
+            search: 'Rechercher',
+            home: 'Accueil',
+            nav_bar: {
+              admin_panel: "Panneau d'administration",
+              close_menu: 'Fermer le menu',
+              go_to_previous_menu: 'Vers le menu précédent',
+              show_menu: 'Afficher le menu',
+              show_search: 'Afficher la recherche',
+              show_user_menu: 'Afficher le menu utilisateur',
+              change_country: 'Changer de pays',
+              desktop: 'Navigation sur le bureau',
+              mobile: 'Navigation mobile'
+            },
+            login: 'Connexion',
+            logout: 'Se déconnecter',
+            sign_up: 'Enregistrer',
+            email: 'Courriel',
+            password: 'Mot de passe',
+            remember_me: 'Se souvenir de moi',
+            my_account: 'Mon compte',
+            my_orders: 'Mes commandes',
+            logged_in_succesfully: 'Connexion réussie'
+          })
+      end
+      # rubocop:enable Layout/ArgumentAlignment
+
+      def open_i18n_menu
+        find('#header #internationalization-button-desktop').click
+      end
+
+      def switch_to_currency(currency)
+        open_i18n_menu
+        select currency, from: 'switch_to_currency'
+      end
+
+      def switch_to_locale(locale)
+        open_i18n_menu
+        select locale, from: 'Language'
+      end
+    end
+  end
+end

data/lib/spree/testing_support/next_instance_of.rb

@@ -0,0 +1,38 @@
+# Helper services with prepended ServiceModule
+# https://gitlab.com/gitlab-org/gitlab-foss/-/issues/33587
+#
+# ex:
+# expect_next_instance_of(service_class) do |instance|
+#   expect(instance).to receive(:call)
+# end
+
+module NextInstanceOf
+  def expect_next_instance_of(klass, *new_args)
+    stub_new(expect(klass), *new_args) do |expectation|
+      yield(expectation)
+    end
+  end
+
+  def allow_next_instance_of(klass, *new_args)
+    stub_new(allow(klass), *new_args) do |allowance|
+      yield(allowance)
+    end
+  end
+
+  private
+
+  def stub_new(target, *new_args)
+    receive_new = receive(:new)
+    receive_new.with(*new_args) if new_args.any?
+
+    target.to receive_new.and_wrap_original do |method, *original_args|
+      method.call(*original_args).tap do |instance|
+        yield(instance)
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include NextInstanceOf
+end

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,9 +28,9 @@ 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 'cancancan', '~> 3.2'
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.5.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
@@ -39,16 +39,17 @@ 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'
   s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
+  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
   s.add_dependency 'image_processing', '~> 1.2'
   s.add_dependency 'active_storage_validations', '~> 0.9'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc1
+  version: 4.2.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2021-02-25 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
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ffaker
   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
@@ -352,7 +378,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -362,7 +388,7 @@ dependencies:
         version: 4.9.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -421,7 +447,9 @@ files:
 - app/assets/images/noimage/small.png
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
+- app/controllers/spree/errors_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
@@ -432,6 +460,8 @@ files:
 - app/finders/spree/variants/option_types_finder.rb
 - app/finders/spree/variants/visible_finder.rb
 - app/helpers/spree/base_helper.rb
+- app/helpers/spree/currency_helper.rb
+- app/helpers/spree/locale_helper.rb
 - app/helpers/spree/mail_helper.rb
 - app/helpers/spree/products_helper.rb
 - app/mailers/spree/base_mailer.rb
@@ -579,7 +609,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,9 +665,10 @@ 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/build_localized_redirect_url.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/estimate_shipping_rates.rb
@@ -655,11 +686,14 @@ 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
 - app/validators/email_validator.rb
 - app/views/layouts/spree/base_mailer.html.erb
+- app/views/spree/errors/forbidden.html.erb
+- app/views/spree/errors/unauthorized.html.erb
 - app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
@@ -686,8 +720,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
@@ -976,7 +1012,17 @@ files:
 - db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb
 - db/migrate/20200610113542_add_label_to_spree_addresses.rb
 - db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb
+- 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/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb
+- db/migrate/20210205211040_add_supported_locales_to_spree_stores.rb
+- db/migrate/20210215202602_migrate_spree_i18n_globalize_config.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -997,8 +1043,6 @@ files:
 - lib/generators/spree/dummy_model/templates/model.rb.tt
 - lib/generators/spree/install/install_generator.rb
 - lib/generators/spree/install/templates/config/initializers/spree.rb
-- lib/generators/spree/install/templates/config/initializers/spree_storefront.rb
-- lib/generators/spree/install/templates/config/spree_storefront.yml
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
@@ -1012,7 +1056,8 @@ files:
 - lib/spree/core/components.rb
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
-- lib/spree/core/controller_helpers/currency_helpers.rb
+- lib/spree/core/controller_helpers/currency.rb
+- lib/spree/core/controller_helpers/locale.rb
 - lib/spree/core/controller_helpers/order.rb
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
@@ -1036,8 +1081,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
@@ -1104,11 +1147,15 @@ files:
 - lib/spree/testing_support/factories/zone_factory.rb
 - lib/spree/testing_support/factories/zone_member_factory.rb
 - lib/spree/testing_support/flash.rb
+- lib/spree/testing_support/flatpickr_capybara.rb
 - lib/spree/testing_support/i18n.rb
 - lib/spree/testing_support/image_helpers.rb
 - lib/spree/testing_support/kernel.rb
+- lib/spree/testing_support/locale_helpers.rb
+- lib/spree/testing_support/next_instance_of.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
@@ -1128,9 +1175,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.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0
 post_install_message:
 rdoc_options: []
 require_paths: