spree_core 4.2.0.rc2 → 4.2.1

data/lib/spree/testing_support/common_rake.rb

@@ -15,7 +15,7 @@ namespace :common do
     Rails.env = 'test'
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', "--user_class=#{args[:user_class]}"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', '--install_storefront=false', "--user_class=#{args[:user_class]}"]
 
     puts 'Setting up dummy database...'
     system("bundle exec rake db:drop db:create > #{File::NULL}")

data/lib/spree/testing_support/controller_requests.rb

@@ -9,7 +9,7 @@ module Spree
 
       def spree_get(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_get is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_get is deprecated and will be removed in Spree 5.0.
           Please use get, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'GET')
@@ -18,7 +18,7 @@ module Spree
       # Executes a request simulating POST HTTP method and set/volley the response
       def spree_post(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_post is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_post is deprecated and will be removed in Spree 5.0.
           Please use post, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'POST')
@@ -27,7 +27,7 @@ module Spree
       # Executes a request simulating PUT HTTP method and set/volley the response
       def spree_put(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_put is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_put is deprecated and will be removed in Spree 5.0.
           Please use put, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PUT')
@@ -36,7 +36,7 @@ module Spree
       # # Executes a request simulating PATCH HTTP method and set/volley the response
       def spree_patch(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_patch is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_patch is deprecated and will be removed in Spree 5.0.
           Please use patch, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PATCH')
@@ -45,7 +45,7 @@ module Spree
       # Executes a request simulating DELETE HTTP method and set/volley the response
       def spree_delete(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_delete is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_delete is deprecated and will be removed in Spree 5.0.
           Please use delete, params: {}
         DEPRECATION
         process_spree_action(action, parameters, session, flash, 'DELETE')
@@ -53,35 +53,35 @@ module Spree
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :get)
       end
 
       def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :post)
       end
 
       def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :put)
       end
 
       def spree_xhr_patch(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :patch)
       end
 
       def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
         ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 4.1.
+          ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :delete)
       end

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -8,15 +8,13 @@ FactoryBot.define do
 
     after(:create) do |shipment, _evalulator|
       shipment.add_shipping_method(create(:shipping_method), true)
-
-      shipment.order.line_items.each do |line_item|
-        line_item.quantity.times do
-          shipment.inventory_units.create(
-            order_id: shipment.order_id,
-            variant_id: line_item.variant_id,
-            line_item_id: line_item.id
-          )
-        end
+      shipment.order.line_items.map do |line_item|
+        shipment.inventory_units.create(
+          order_id: shipment.order_id,
+          variant_id: line_item.variant_id,
+          line_item_id: line_item.id,
+          quantity: line_item.quantity
+        )
       end
     end
   end

data/lib/spree/testing_support/factories/stock_location_factory.rb

@@ -20,8 +20,8 @@ FactoryBot.define do
         product_1 = create(:product)
         product_2 = create(:product)
 
-        stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
-        stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)
+        stock_location.stock_items.where(variant_id: product_1.master_id).first.adjust_count_on_hand(10)
+        stock_location.stock_items.where(variant_id: product_2.master_id).first.adjust_count_on_hand(20)
       end
     end
   end

data/lib/spree/testing_support/factories/store_factory.rb

@@ -8,6 +8,7 @@ FactoryBot.define do
     new_order_notifications_email { 'store-owner@example.com' }
     default_currency       { 'USD' }
     supported_currencies   { 'USD,EUR,GBP' }
+    default_locale         { 'en' }
     facebook               { 'spreecommerce' }
     twitter                { 'spreecommerce' }
     instagram              { 'spreecommerce' }

data/lib/spree/testing_support/factories/zone_factory.rb

@@ -1,24 +1,27 @@
 FactoryBot.define do
-  factory :global_zone, class: Spree::Zone do
-    sequence(:name) { |n| "GlobalZone_#{n}" }
-    description { generate(:random_string) }
-    zone_members do |proxy|
-      zone = proxy.instance_eval { @instance }
-      Spree::Country.all.map do |c|
-        Spree::ZoneMember.create(zoneable: c, zone: zone)
-      end
-    end
-  end
-
   factory :zone, class: Spree::Zone do
     name        { generate(:random_string) }
     description { generate(:random_string) }
 
     factory :zone_with_country do
+      kind { :country }
+
       zone_members do |proxy|
         zone = proxy.instance_eval { @instance }
-        country = create(:country)
-        [Spree::ZoneMember.create(zoneable: country, zone: zone)]
+
+        [Spree::ZoneMember.create(zoneable: create(:country), zone: zone)]
+      end
+
+      factory :global_zone, class: Spree::Zone do
+        sequence(:name) { |n| "GlobalZone_#{n}" }
+
+        zone_members do |proxy|
+          zone = proxy.instance_eval { @instance }
+
+          Spree::Country.all.map do |country|
+            Spree::ZoneMember.where(zoneable: country, zone: zone).first_or_create
+          end
+        end
       end
     end
   end

data/lib/spree/testing_support/flatpickr_capybara.rb

@@ -0,0 +1,101 @@
+module Spree
+  module TestingSupport
+    module FlatpickrCapybara
+      def fill_in_date_manually(label_text, with:)
+        with_open_flatpickr(label_text) do |field|
+          fill_in field[:id], with: with
+        end
+      end
+
+      def fill_in_date_picker(label_text, with:)
+        within_open_flatpickr(label_text) do
+          within_flatpickr_months do
+            fill_in_flatpickr_year(with.split('-')[0])
+
+            select_flatpickr_month(with.split('-')[1])
+
+            click_on_flatpickr_day(with.split('-')[2])
+          end
+        end
+      end
+
+      def fill_in_date_time_picker(label_text, with:)
+        within_open_flatpickr(label_text) do
+          within_flatpickr_months do
+            fill_in_flatpickr_year(with.split('-')[0])
+
+            select_flatpickr_month(with.split('-')[1])
+
+            click_on_flatpickr_day(with.split('-')[2])
+          end
+
+          within_flatpickr_time do
+            select_flatpickr_hour(with.split('-')[3])
+
+            select_flatpickr_min(with.split('-')[4])
+          end
+        end
+      end
+
+      def fill_in_date_with_js(label_text, with:)
+        date_field = find("input[id='#{label_text}']")
+        script = "document.querySelector('#{date_field}').flatpickr().setDate('#{with}');"
+
+        page.execute_script(script)
+      end
+
+      private
+
+      def with_open_flatpickr(label_text)
+        field_label = find_field(id: label_text, type: :hidden)
+
+        date_field = field_label.sibling('.flatpickr-alt-input')
+        date_field.click # Open the widget
+
+        yield(date_field)
+
+        date_field.send_keys :tab # Close the date picker widget
+      end
+
+      def within_open_flatpickr(label_text)
+        with_open_flatpickr(label_text) do
+          within find(:xpath, "/html/body/div[contains(@class, 'flatpickr-calendar')]") { yield }
+        end
+      end
+
+      def within_flatpickr_months
+        within find('.flatpickr-months .flatpickr-month .flatpickr-current-month') { yield }
+      end
+
+      def within_flatpickr_time
+        within find('.flatpickr-time') { yield }
+      end
+
+      def select_flatpickr_month(month)
+        find("select.flatpickr-monthDropdown-months > option:nth-child(#{month.to_i})").select_option
+      end
+
+      def fill_in_flatpickr_year(year)
+        find('input.cur-year').set(year)
+      end
+
+      def click_on_flatpickr_day(day)
+        within_flatpickr_days do
+          find('span', text: day).click
+        end
+      end
+
+      def within_flatpickr_days
+        within find('.flatpickr-innerContainer > .flatpickr-rContainer > .flatpickr-days') { yield }
+      end
+
+      def select_flatpickr_hour(hour)
+        find('input.flatpickr-hour').set(hour)
+      end
+
+      def select_flatpickr_min(min)
+        find('input.flatpickr-minute').set(min)
+      end
+    end
+  end
+end

data/lib/spree/testing_support/locale_helpers.rb

@@ -0,0 +1,78 @@
+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
+        expect(page).to have_selector('#internationalization-options-desktop')
+      end
+
+      def close_i18n_menu
+        find('#header #internationalization-button-desktop').click
+        expect(page).not_to have_selector('#internationalization-options-desktop')
+      end
+
+      def switch_to_currency(currency)
+        open_i18n_menu
+        select currency, from: 'switch_to_currency'
+        expect(page).to have_no_css '.turbolinks-progress-bar'
+      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,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'