spree_core 3.6.6 → 3.7.0.rc1

data/lib/spree/money.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'money'
 
 Money.locale_backend = :i18n
@@ -9,6 +7,7 @@ module Spree
     class <<self
       attr_accessor :default_formatting_rules
     end
+
     self.default_formatting_rules = {
       # Ruby money currently has this as false, which is wrong for the vast
       # majority of locales.
@@ -16,11 +15,10 @@ module Spree
     }
 
     attr_reader :money
-
-    delegate :cents, :currency, to: :money
+    delegate    :cents, :currency, to: :money
 
     def initialize(amount, options = {})
-      @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
+      @money   = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
 
@@ -29,7 +27,7 @@ module Spree
     end
 
     def to_s
-      @money.format(@options)
+      money.format(options)
     end
 
     # 1) prevent blank, breaking spaces
@@ -39,7 +37,7 @@ module Spree
       opts[:html_wrap] = opts[:html]
       opts.delete(:html)
 
-      output = money.format(@options.merge(opts))
+      output = money.format(options.merge(opts))
       if opts[:html_wrap]
         output.gsub!(/<\/?[^>]*>/, '') # we don't want wrap every element in span
         output = output.sub(' ', '&nbsp;').html_safe
@@ -53,17 +51,19 @@ module Spree
     end
 
     def decimal_mark
-      return @money.decimal_mark if @options[:decimal_mark].nil?
-      @options[:decimal_mark]
+      options[:decimal_mark] || money.decimal_mark
     end
 
     def thousands_separator
-      return @money.thousands_separator if @options[:thousands_separator].nil?
-      @options[:thousands_separator]
+      options[:thousands_separator] || money.thousands_separator
     end
 
     def ==(obj)
-      @money == obj.money
+      money == obj.money
     end
+
+    private
+
+    attr_reader :options
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -72,34 +72,39 @@ module Spree
 
     @@shipment_attributes = [
       :order, :special_instructions, :stock_location_id, :id,
-      :tracking, :address, :inventory_units, :selected_shipping_rate_id]
+      :tracking, :address, :inventory_units, :selected_shipping_rate_id
+    ]
 
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
-      :gateway_payment_profile_id, :last_digits, :name, :encrypted_data]
+      :gateway_payment_profile_id, :last_digits, :name, :encrypted_data
+    ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
 
     @@stock_location_attributes = [
       :name, :active, :address1, :address2, :city, :zipcode,
       :backorderable_default, :state_name, :state_id, :country_id, :phone,
-      :propagate_all_variants]
+      :propagate_all_variants
+    ]
 
     @@stock_movement_attributes = [
-      :quantity, :stock_item, :stock_item_id, :originator, :action]
+      :quantity, :stock_item, :stock_item_id, :originator, :action
+    ]
 
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
                           :meta_description, :default_currency, :mail_from_address]
 
-    @@store_credit_attributes = [:amount, :category_id, :memo]
+    @@store_credit_attributes = %i[amount currency category_id memo]
 
     @@taxonomy_attributes = [:name]
 
     @@taxon_attributes = [
       :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
-      :meta_description, :meta_keywords, :meta_title, :child_index]
+      :meta_description, :meta_keywords, :meta_title, :child_index
+    ]
 
     # TODO: Should probably use something like Spree.user_class.attributes
     @@user_attributes = [:email, :password, :password_confirmation]

data/lib/spree/service_module.rb

@@ -0,0 +1,98 @@
+module Spree
+  module ServiceModule
+    module Callable
+      def call(*args)
+        new.call(*args).tap do |result|
+          return yield(result) if block_given?
+        end
+      end
+    end
+
+    class MethodNotImplemented < StandardError; end
+    class WrongDataPassed < StandardError; end
+    class NonCallablePassedToRun < StandardError; end
+    class IncompatibleParamsPassed < StandardError; end
+
+    Result = Struct.new(:success, :value, :error) do
+      def success?
+        success
+      end
+
+      def failure?
+        !success
+      end
+    end
+
+    ResultError = Struct.new(:value) do
+      def to_s
+        return value.full_messages.join(', ') if value&.respond_to?(:full_messages)
+
+        value.to_s
+      end
+
+      def to_h
+        return value.messages if value&.respond_to?(:messages)
+
+        {}
+      end
+    end
+
+    module Base
+      def self.prepended(base)
+        class << base
+          prepend Callable
+        end
+      end
+
+      def call(input = nil)
+        input ||= {}
+        @_passed_input = Result.new(true, input)
+        result = super
+        @_passed_input = result if result.is_a? Result
+        enforce_data_format
+        @_passed_input
+      end
+
+      private
+
+      def run(callable)
+        return unless @_passed_input.success?
+
+        if callable.instance_of? Symbol
+          unless respond_to?(callable, true)
+            raise MethodNotImplemented, "You didn't implement #{callable} method. Implement it before calling this class"
+          end
+
+          callable = method(callable)
+        end
+
+        unless callable.respond_to?(:call)
+          raise NonCallablePassedToRun, 'You can pass only symbol with method name or instance of callable class to run method'
+        end
+
+        begin
+          @_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}'"
+          else
+            raise IncompatibleParamsPassed, "You passed #{e.message} to callable '#{callable.name}'"
+          end
+        end
+      end
+
+      def success(value)
+        Result.new(true, value, nil)
+      end
+
+      def failure(value, error = nil)
+        error = value.errors if error.nil? && value.respond_to?(:errors)
+        Result.new(false, value, ResultError.new(error))
+      end
+
+      def enforce_data_format
+        raise WrongDataPassed, "You didn't use `success` or `failure` method to return value from method." unless @_passed_input.instance_of? Result
+      end
+    end
+  end
+end

data/lib/spree/testing_support/capybara_config.rb

@@ -0,0 +1,20 @@
+require 'capybara-screenshot/rspec'
+
+Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+
+if ENV['WEBDRIVER'] == 'accessible'
+  require 'capybara/accessible'
+  Capybara.javascript_driver = :accessible
+else
+  Capybara.register_driver :chrome do |app|
+    Capybara::Selenium::Driver.new app,
+      browser: :chrome,
+      options: Selenium::WebDriver::Chrome::Options.new(args: %w[disable-popup-blocking headless disable-gpu window-size=1920,1080])
+  end
+  Capybara.javascript_driver = :chrome
+
+  Capybara::Screenshot.register_driver(:chrome) do |driver, path|
+    driver.browser.save_screenshot(path)
+  end
+end
+Capybara.default_max_wait_time = 45

data/lib/spree/testing_support/capybara_ext.rb

@@ -1,4 +1,9 @@
 module CapybaraExt
+  # https://bugs.chromium.org/p/chromedriver/issues/detail?id=1771
+  def native_fill_in(selector, text)
+    text.to_s.split('').each { |char| find_field(selector).native.send_keys(char) }
+  end
+
   def page!
     save_and_open_page
   end
@@ -101,9 +106,7 @@ module CapybaraExt
   def wait_for_ajax(delay = Capybara.default_max_wait_time)
     Timeout.timeout(delay) do
       active = page.evaluate_script('typeof jQuery !== "undefined" && jQuery.active')
-      until active.zero?
-        active = page.evaluate_script('typeof jQuery !== "undefined" && jQuery.active')
-      end
+      active = page.evaluate_script('typeof jQuery !== "undefined" && jQuery.active') until active.zero?
     end
   end
 

data/lib/spree/testing_support/factories.rb

@@ -12,7 +12,7 @@ end
 
 FactoryBot.define do
   sequence(:random_string) { FFaker::Lorem.sentence }
-  sequence(:random_description) { FFaker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
+  sequence(:random_description) { FFaker::Lorem.paragraphs(Kernel.rand(1..5)).join("\n") }
   sequence(:random_email) { FFaker::Internet.email }
 
   sequence(:sku) { |n| "SKU-#{n}" }

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

@@ -1,16 +1,17 @@
 FactoryBot.define do
   factory :address, aliases: [:bill_address, :ship_address], class: Spree::Address do
-    firstname 'John'
-    lastname 'Doe'
-    company 'Company'
-    address1 '10 Lovely Street'
-    address2 'Northwest'
-    city 'Herndon'
-    zipcode '35005'
-    phone '555-555-0199'
-    alternative_phone '555-555-0199'
+    firstname         { 'John' }
+    lastname          { 'Doe' }
+    company           { 'Company' }
+    address1          { '10 Lovely Street' }
+    address2          { 'Northwest' }
+    city              { 'Herndon' }
+    zipcode           { '35005' }
+    phone             { '555-555-0199' }
+    alternative_phone { '555-555-0199' }
 
     state { |address| address.association(:state) || Spree::State.last }
+
     country do |address|
       if address.state
         address.state.country

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

@@ -1,18 +1,20 @@
 FactoryBot.define do
   factory :adjustment, class: Spree::Adjustment do
     association(:adjustable, factory: :order)
-    amount 100.0
-    label 'Shipping'
     association(:source, factory: :tax_rate)
-    eligible true
+
+    amount   { 100.0 }
+    label    { 'Shipping' }
+    eligible { true }
   end
 
   factory :tax_adjustment, class: Spree::Adjustment do
     association(:adjustable, factory: :line_item)
-    amount 10.0
-    label 'VAT 5%'
     association(:source, factory: :tax_rate)
-    eligible true
+
+    amount   { 10.0 }
+    label    { 'VAT 5%' }
+    eligible { true }
 
     after(:create) do |adjustment|
       # Set correct tax category, so that adjustment amount is not 0

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

@@ -1,9 +1,9 @@
 FactoryBot.define do
   factory :country, class: Spree::Country do
     sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
-    sequence(:name) { |n| "NAME_#{n}" }
-    iso 'US'
-    iso3 'USA'
-    numcode 840
+    sequence(:name)     { |n| "NAME_#{n}" }
+    iso                 { 'US' }
+    iso3                { 'USA' }
+    numcode             { 840 }
   end
 end

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

@@ -1,10 +1,12 @@
 FactoryBot.define do
   factory :credit_card, class: Spree::CreditCard do
-    verification_value 123
-    month 12
-    year { 1.year.from_now.year }
-    number '4111111111111111'
-    name 'Spree Commerce'
+    verification_value { 123 }
+    month              { 12 }
+    year               { 1.year.from_now.year }
+    number             { '4111111111111111' }
+    name               { 'Spree Commerce' }
+    cc_type            { 'visa' }
+
     association(:payment_method, factory: :credit_card_payment_method)
   end
 end

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     association(:stock_location, factory: :stock_location)
 
     transient do
-      line_items_count 1
+      line_items_count   { 1 }
       return_items_count { line_items_count }
     end
 

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

@@ -1,5 +1,11 @@
 FactoryBot.define do
   factory :image, class: Spree::Image do
-    attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg') }
+    if Rails.application.config.use_paperclip
+      attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg') }
+    else
+      before(:create) do |image|
+        image.attachment.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg'), filename: 'thinking-cat.jpg')
+      end
+    end
   end
 end

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

@@ -3,15 +3,16 @@ FactoryBot.define do
     variant
     order
     line_item
-    state 'on_hand'
+    state { 'on_hand' }
+
     association(:shipment, factory: :shipment, state: 'pending')
     # return_authorization
 
     # this trait usage increases build speed ~ 2x
     trait :without_assoc do
-      shipment nil
-      order nil
-      line_item nil
+      shipment  { nil }
+      order     { nil }
+      line_item { nil }
     end
   end
 end

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

@@ -1,8 +1,9 @@
 FactoryBot.define do
   factory :line_item, class: Spree::LineItem do
-    quantity 1
-    price { BigDecimal.new('10.00') }
     order
+    quantity { 1 }
+    price    { BigDecimal('10.00') }
+    currency { order.currency }
     transient do
       association :product
     end

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

@@ -1,13 +1,12 @@
 FactoryBot.define do
   factory :option_value, class: Spree::OptionValue do
     sequence(:name) { |n| "Size-#{n}" }
-
-    presentation 'S'
+    presentation    { 'S' }
     option_type
   end
 
   factory :option_type, class: Spree::OptionType do
     sequence(:name) { |n| "foo-size-#{n}" }
-    presentation 'Size'
+    presentation    { 'Size' }
   end
 end

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

@@ -2,12 +2,13 @@ FactoryBot.define do
   factory :order, class: Spree::Order do
     user
     bill_address
-    completed_at nil
-    email { user.email }
     store
+    completed_at { nil }
+    email        { user.email }
+    currency     { 'USD' }
 
     transient do
-      line_items_price BigDecimal.new(10)
+      line_items_price { BigDecimal(10) }
     end
 
     factory :order_with_totals do
@@ -19,7 +20,7 @@ FactoryBot.define do
 
     factory :order_with_line_item_quantity do
       transient do
-        line_items_quantity 1
+        line_items_quantity { 1 }
       end
 
       after(:create) do |order, evaluator|
@@ -33,14 +34,17 @@ FactoryBot.define do
       ship_address
 
       transient do
-        line_items_count 1
-        shipment_cost 100
-        shipping_method_filter Spree::ShippingMethod::DISPLAY_ON_FRONT_END
+        line_items_count       { 1 }
+        without_line_items     { false }
+        shipment_cost          { 100 }
+        shipping_method_filter { Spree::ShippingMethod::DISPLAY_ON_FRONT_END }
       end
 
       after(:create) do |order, evaluator|
-        create_list(:line_item, evaluator.line_items_count, order: order, price: evaluator.line_items_price)
-        order.line_items.reload
+        unless evaluator.without_line_items
+          create_list(:line_item, evaluator.line_items_count, order: order, price: evaluator.line_items_price)
+          order.line_items.reload
+        end
 
         create(:shipment, order: order, cost: evaluator.shipment_cost)
         order.shipments.reload
@@ -49,7 +53,7 @@ FactoryBot.define do
       end
 
       factory :completed_order_with_totals do
-        state 'complete'
+        state { 'complete' }
 
         after(:create) do |order, evaluator|
           order.refresh_shipment_rates(evaluator.shipping_method_filter)
@@ -69,8 +73,8 @@ FactoryBot.define do
         end
 
         factory :order_ready_to_ship do
-          payment_state 'paid'
-          shipment_state 'ready'
+          payment_state  { 'paid' }
+          shipment_state { 'ready' }
 
           after(:create) do |order|
             create(:payment, amount: order.total, order: order, state: 'completed')