spree_core 4.2.0.rc5 → 4.2.0

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc5
+  version: 4.2.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -460,6 +460,7 @@ 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
@@ -667,6 +668,7 @@ files:
 - 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
@@ -1019,6 +1021,8 @@ files:
 - 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
@@ -1039,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
@@ -1145,9 +1147,12 @@ 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
@@ -1170,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.rc5
+  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.rc5
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/generators/spree/install/templates/config/initializers/spree_storefront.rb

@@ -1 +0,0 @@
-SpreeStorefrontConfig = YAML.load_file(Rails.root.join('config', 'spree_storefront.yml')).with_indifferent_access

data/lib/generators/spree/install/templates/config/spree_storefront.yml

@@ -1,67 +0,0 @@
-default:
-  navigation:
-    - title: Women
-      subtitle: Categories
-      url: /t/women
-      items:
-        - :title: Skirts
-          :url: /t/women/skirts
-        - :title: Dresses
-          :url: /t/women/dresses
-        - :title: Shirts and Blouses
-          :url: /t/women/shirts-and-blouses
-        - :title: Sweaters
-          :url: /t/women/sweaters
-        - :title: Tops and T-shirts
-          :url: /t/women/tops-and-t-shirts
-        - :title: Jackets and Coats
-          :url: /t/women/jackets-and-coats
-      promo_banners:
-        - subtitle: New collection
-          title: Summer 2021
-          url: /t/new-collection/summer-2021
-          image: 'meganav/promo_banner_left-first-category.jpg'
-        - subtitle: Special Offers
-          title: Get up to 30% off
-          url: /t/special-offers/30-percent-off
-          image: 'meganav/promo_banner_right-first-category.jpg'
-    - title: Men
-      subtitle: Categories
-      url: /t/men
-      items:
-        - :title: Shirts
-          :url: /t/men/shirts
-        - :title: T-shirts
-          :url: /t/men/t-shirts
-        - :title: Sweaters
-          :url: /t/men/sweaters
-        - :title: Jackets and Coats
-          :url: /t/men/jackets-and-coats
-      promo_banners:
-        - subtitle: New collection
-          title: Summer 2021
-          url: /t/new-collection/summer-2021
-          image: 'meganav/promo_banner_left-second-category.jpg'
-        - subtitle: Special Offers
-          title: Get up to 30% off
-          url: /t/special-offers/30-percent-off
-          image: 'meganav/promo_banner_right-second-category.jpg'
-    - title: Sportswear
-      subtitle: Categories
-      url: /t/sportswear
-      items:
-        - :title: Tops
-          :url: /t/sportswear/tops
-        - :title: Sweatshirts
-          :url: /t/sportswear/sweatshirts
-        - :title: Pants
-          :url: /t/sportswear/pants
-      promo_banners:
-        - subtitle: New collection
-          title: Summer 2021
-          url: /t/new-collection/summer-2021
-          image: 'meganav/promo_banner_left-third-category.jpg'
-        - subtitle: Special Offers
-          title: Get up to 30% off
-          url: /t/special-offers/30-percent-off
-          image: 'meganav/promo_banner_right-third-category.jpg'