spree_core 4.2.0.rc1 → 4.2.0

data/lib/spree/core/product_filters.rb

@@ -68,9 +68,9 @@ module Spree
       def self.price_filter
         v = Spree::Price.arel_table
         conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
-                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
-                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
-                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
+                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].between(10..15)],
+                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].between(15..18)],
+                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].between(18..20)],
                  [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
         {
           name: Spree.t(:price_range),

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.2.0.rc1'
+    '4.2.0'
   end
 end

data/lib/spree/i18n.rb

@@ -1,35 +1,33 @@
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
-require 'spree/i18n/base'
+require 'action_view'
 
 module Spree
-  extend ActionView::Helpers::TranslationHelper
-  extend ActionView::Helpers::TagHelper
+  class TranslationHelperWrapper
+    include ActionView::Helpers::TranslationHelper
+  end
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
     # extra functionality. e.g return reasonable strings for missing translations
-    def translate(*args)
-      @virtual_path = virtual_path
+    def translate(key, options = {})
+      options[:scope] = [*options[:scope]].unshift(:spree).uniq
 
-      options = args.extract_options!
-      options[:scope] = [*options[:scope]].unshift(:spree)
-      args << options
-      super(*args)
+      TranslationHelperWrapper.new.translate(key, **options)
     end
 
-    alias t translate
+    def available_locales
+      locales_from_i18n = I18n.available_locales
+      locales =
+        if defined?(SpreeI18n)
+          (SpreeI18n::Locale.all << :en).map(&:to_s)
+        else
+          [Rails.application.config.i18n.default_locale, I18n.locale, :en]
+        end
 
-    def context
-      Spree::ViewContext.context
+      (locales + locales_from_i18n).uniq.compact
     end
 
-    def virtual_path
-      if context
-        path = context.instance_variable_get('@virtual_path')
-
-        path&.gsub(/spree/, '')
-      end
-    end
+    alias t translate
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -99,9 +99,9 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords, :logo,
                           :meta_description, :default_currency, :mail_from_address,
                           :customer_support_email, :facebook, :twitter, :instagram,
-                          :description, :address, :contact_email, :contact_phone,
+                          :description, :address, :contact_phone, :supported_locales,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email, :mailer_logo]
+                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id, :seo_robots]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/service_module.rb

@@ -1,8 +1,8 @@
 module Spree
   module ServiceModule
     module Callable
-      def call(*args)
-        new.call(*args).tap do |result|
+      def call(*args, **kwargs)
+        new.call(*args, **kwargs).tap do |result|
           return yield(result) if block_given?
         end
       end
@@ -47,7 +47,11 @@ module Spree
       def call(input = nil)
         input ||= {}
         @_passed_input = Result.new(true, input)
-        result = super
+        result = if input.is_a?(Hash)
+                   super(**input)
+                 else
+                   super(input)
+                 end
         @_passed_input = result if result.is_a? Result
         enforce_data_format
         @_passed_input
@@ -71,7 +75,7 @@ module Spree
         end
 
         begin
-          @_passed_input = callable.call(@_passed_input.value)
+          @_passed_input = callable.call(**@_passed_input.value)
         rescue ArgumentError => e
           if e.message.include? 'missing'
             raise IncompatibleParamsPassed, "You didn't pass #{e.message} to callable '#{callable.name}'"

data/lib/spree/testing_support/capybara_config.rb

@@ -23,4 +23,4 @@ else
   end
 end
 Capybara.default_max_wait_time = 45
-Capybara.server = :webrick
+Capybara.server = :puma

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/promotion_factory.rb

@@ -1,4 +1,21 @@
 FactoryBot.define do
+  trait :with_item_total_rule do
+    transient do
+      item_total_threshold_amount { 10 }
+    end
+
+    after(:create) do |promotion, evaluator|
+      rule = Spree::Promotion::Rules::ItemTotal.create!(
+        preferred_operator_min: 'gte',
+        preferred_operator_max: 'lte',
+        preferred_amount_min: evaluator.item_total_threshold_amount,
+        preferred_amount_max: evaluator.item_total_threshold_amount + 100
+      )
+      promotion.rules << rule
+      promotion.save!
+    end
+  end
+
   factory :promotion, class: Spree::Promotion do
     name { 'Promo' }
 
@@ -13,7 +30,16 @@ FactoryBot.define do
         Spree::Promotion::Actions::CreateItemAdjustments.create!(calculator: calculator, promotion: promotion)
       end
     end
+
+    trait :with_one_use_per_user_rule do
+      after(:create) do |promotion|
+        rule = Spree::Promotion::Rules::OneUsePerUser.create!
+        promotion.rules << rule
+      end
+    end
+
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
+    factory :promotion_with_one_use_per_user_rule, traits: [:with_line_item_adjustment, :with_one_use_per_user_rule]
 
     trait :with_order_adjustment do
       transient do
@@ -28,24 +54,8 @@ FactoryBot.define do
         promotion.save!
       end
     end
-    factory :promotion_with_order_adjustment, traits: [:with_order_adjustment]
 
-    trait :with_item_total_rule do
-      transient do
-        item_total_threshold_amount { 10 }
-      end
-
-      after(:create) do |promotion, evaluator|
-        rule = Spree::Promotion::Rules::ItemTotal.create!(
-          preferred_operator_min: 'gte',
-          preferred_operator_max: 'lte',
-          preferred_amount_min: evaluator.item_total_threshold_amount,
-          preferred_amount_max: evaluator.item_total_threshold_amount + 100
-        )
-        promotion.rules << rule
-        promotion.save!
-      end
-    end
+    factory :promotion_with_order_adjustment, traits: [:with_order_adjustment]
     factory :promotion_with_item_total_rule, traits: [:with_item_total_rule]
   end
 
@@ -57,5 +67,7 @@ FactoryBot.define do
       action.promotion = promotion
       action.save
     end
+
+    factory :free_shipping_promotion_with_item_total_rule, traits: [:with_item_total_rule]
   end
 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
-    name        { 'GlobalZone' }
-    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