spree_core 3.7.14.1 → 4.0.0.beta

data/lib/spree/core/importer/product.rb

@@ -26,11 +26,11 @@ module Spree
         end
 
         def update
-          if product.update_attributes(product_attrs)
+          if product.update(product_attrs)
             variants_attrs.each do |variant_attribute|
               # update the variant if the id is present in the payload
               if variant_attribute['id'].present?
-                product.variants.find(variant_attribute['id'].to_i).update_attributes(variant_attribute)
+                product.variants.find(variant_attribute['id'].to_i).update(variant_attribute)
               else
                 # make sure the product is assigned before the options=
                 product.variants.create({ product: product }.merge(variant_attribute))

data/lib/spree/core/product_duplicator.rb

@@ -58,11 +58,7 @@ module Spree
 
     def duplicate_image(image)
       new_image = image.dup
-      if Rails.application.config.use_paperclip
-        new_image.assign_attributes(attachment: image.attachment.clone)
-      else
-        new_image.attachment.attach(image.attachment.blob)
-      end
+      new_image.attachment.attach(image.attachment.blob)
       new_image.save!
       new_image
     end

data/lib/spree/core/version.rb

@@ -1,7 +1,5 @@
 module Spree
-  VERSION = '3.7.14.1'.freeze
-
   def self.version
-    VERSION
+    '4.0.0.beta'
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -33,12 +33,14 @@ module Spree
       :id, :firstname, :lastname, :first_name, :last_name,
       :address1, :address2, :city, :country_iso, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
+      :user_id, :deleted_at,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
     ]
 
     @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :user_id
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, 
+      :user_id, :bill_address_id, :ship_address_id
     ]
 
     @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]]

data/lib/spree/testing_support/ability_helpers.rb

@@ -1,7 +1,7 @@
 shared_examples_for 'access granted' do
-  it 'should allow read' do
-    expect(ability).to be_able_to(:read, resource, token) if token
-    expect(ability).to be_able_to(:read, resource) unless token
+  it 'should allow show' do
+    expect(ability).to be_able_to(:show, resource, token) if token
+    expect(ability).to be_able_to(:show, resource) unless token
   end
 
   it 'should allow create' do
@@ -66,10 +66,6 @@ shared_examples_for 'create only' do
   it 'should not allow update' do
     expect(ability).to_not be_able_to(:update, resource)
   end
-
-  it 'should not allow index' do
-    expect(ability).to_not be_able_to(:index, resource)
-  end
 end
 
 shared_examples_for 'read only' do
@@ -98,8 +94,4 @@ shared_examples_for 'update only' do
   it 'should allow update' do
     expect(ability).to be_able_to(:update, resource)
   end
-
-  it 'should not allow index' do
-    expect(ability).to_not be_able_to(:index, resource)
-  end
 end

data/lib/spree/testing_support/capybara_config.rb

@@ -7,10 +7,12 @@ if ENV['WEBDRIVER'] == 'accessible'
   Capybara.javascript_driver = :accessible
 else
   Capybara.register_driver :chrome do |app|
+    Selenium::WebDriver.logger.level = :error
+
     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],
+        args: %w[no-sandbox disable-dev-shm-usage disable-popup-blocking headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
         log_level: :error
       )
   end
@@ -21,3 +23,4 @@ else
   end
 end
 Capybara.default_max_wait_time = 45
+Capybara.server = :webrick

data/lib/spree/testing_support/capybara_ext.rb

@@ -1,7 +1,11 @@
 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) }
+  def delayed_fill_in(selector, text)
+    field = find_field(selector)
+    text.to_s.split('').each do |char|
+      sleep 0.05
+      field.send_keys(char)
+    end
   end
 
   def page!
@@ -9,19 +13,14 @@ module CapybaraExt
   end
 
   def click_icon(type)
-    find(".icon-#{type}").click
-  end
-
-  def eventually_fill_in(field, options = {})
-    expect(page).to have_css('#' + field)
-    fill_in field, options
+    first(".icon-#{type}").click
   end
 
   def within_row(num, &block)
     if RSpec.current_example.metadata[:js]
-      within("table.table tbody tr:nth-child(#{num})", &block)
+      within("table.table tbody tr:nth-child(#{num})", match: :first, &block)
     else
-      within(:xpath, all('table.table tbody tr')[num - 1].path, &block)
+      within(all('table.table tbody tr')[num - 1], &block)
     end
   end
 
@@ -33,31 +32,29 @@ module CapybaraExt
     end
   end
 
-  def set_select2_field(field, value)
-    page.execute_script %Q{$('#{field}').select2('val', '#{value}')}
-  end
-
   def select2_search(value, options)
-    label = find_label_by_text(options[:from])
-    within label.first(:xpath, './/..') do
-      options[:from] = "##{find('.select2-container')['id']}"
-    end
+    options[:from] = select2_from_label(options[:from])
     targetted_select2_search(value, options)
   end
 
   def targetted_select2_search(value, options)
-    page.execute_script %Q{$('#{options[:from]}').select2('open')}
-    page.execute_script "$('#{options[:dropdown_css]} input.select2-input').val('#{value}').trigger('keyup-change');"
+    select2_el = find(:css, options[:from])
+    select2_el.click
+    page.document.find('.select2-search input.select2-input,
+                        .select2-search-field input.select2-input.select2-focused').send_keys(value)
     select_select2_result(value)
   end
 
   def select2(value, options)
-    label = find_label_by_text(options[:from])
+    options[:from] = select2_from_label(options[:from])
+    targetted_select2(value, options)
+  end
 
+  def select2_from_label(from)
+    label = find(:label, from, class: '!select2-offscreen')
     within label.first(:xpath, './/..') do
-      options[:from] = "##{find('.select2-container')['id']}"
+      "##{find('.select2-container')['id']}"
     end
-    targetted_select2(value, options)
   end
 
   def select2_no_label(value, options = {})
@@ -77,29 +74,7 @@ module CapybaraExt
 
   def select_select2_result(value)
     # results are in a div appended to the end of the document
-    within(:xpath, '//body') do
-      page.find('div.select2-result-label', text: %r{#{Regexp.escape(value)}}i).click
-    end
-  end
-
-  def find_label_by_text(text)
-    label = find_label(text)
-    counter = 0
-
-    # Because JavaScript testing is prone to errors...
-    while label.nil? && counter < 10
-      sleep(1)
-      counter += 1
-      label = find_label(text)
-    end
-
-    raise "Could not find label by text #{text}" if label.nil?
-
-    label
-  end
-
-  def find_label(text)
-    first(:xpath, "//label[text()[contains(.,'#{text}')]]")
+    page.document.find('div.select2-result-label', match: :first, text: %r{#{Regexp.escape(value)}}i).click
   end
 
   # arg delay in seconds
@@ -110,11 +85,6 @@ module CapybaraExt
     end
   end
 
-  # "Intelligiently" wait on condition
-  #
-  # Much better than a random sleep "here and there"
-  # it will not cause any delay in case the condition is fullfilled on first cycle.
-
   def wait_for_condition(delay = Capybara.default_max_wait_time)
     counter = 0
     delay_threshold = delay * 10
@@ -125,40 +95,9 @@ module CapybaraExt
     end
   end
 
-  def dismiss_alert
-    page.evaluate_script('window.confirm = function() { return false; }')
-    yield
-    # Restore existing default
-    page.evaluate_script('window.confirm = function() { return true; }')
-  end
-
-  def spree_accept_alert
-    yield
-  rescue Selenium::WebDriver::Error::UnhandledAlertError, Selenium::WebDriver::Error::NoSuchAlertError
-    Selenium::WebDriver::Wait.new(timeout: 5)
-      .until { page.driver.browser.switch_to.alert }
-      .accept
-  end
-
   def disable_html5_validation
     page.execute_script('for(var f=document.forms,i=f.length;i--;)f[i].setAttribute("novalidate",i)')
   end
-
-  def handle_js_confirm(accept = true)
-    page.evaluate_script 'window.original_confirm_function = window.confirm'
-    page.evaluate_script "window.confirm = function(msg) { return #{accept}; }"
-    yield
-  ensure
-    page.evaluate_script 'window.confirm = window.original_confirm_function'
-  end
-end
-
-def wait_for(options = {})
-  default_options = { error: nil, seconds: 5 }.merge(options)
-
-  Selenium::WebDriver::Wait.new(timeout: default_options[:seconds]).until { yield }
-rescue Selenium::WebDriver::Error::TimeOutError
-  default_options[:error].nil? ? false : raise(default_options[:error])
 end
 
 def wait_for(options = {})
@@ -170,7 +109,7 @@ rescue Selenium::WebDriver::Error::TimeOutError
 end
 
 Capybara.configure do |config|
-  config.match = :prefer_exact
+  config.match = :smart
   config.ignore_hidden_elements = true
 end
 
@@ -189,21 +128,6 @@ RSpec::Matchers.define :have_meta do |name, expected|
   end
 end
 
-RSpec::Matchers.define :have_title do |expected|
-  match do |_actual|
-    has_css?('title', text: expected, visible: false)
-  end
-
-  failure_message do |actual|
-    actual = first('title')
-    if actual
-      "expected that title would have been '#{expected}' but was '#{actual.text}'"
-    else
-      "expected that title would exist with '#{expected}'"
-    end
-  end
-end
-
 RSpec.configure do |c|
   c.include CapybaraExt
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -1,28 +1,3 @@
-# Use this module to easily test Spree actions within Spree components
-# or inside your application to test routes for the mounted Spree engine.
-#
-# Inside your spec_helper.rb, include this module inside the RSpec.configure
-# block by doing this:
-#
-#   require 'spree/testing_support/controller_requests'
-#   RSpec.configure do |c|
-#     c.include Spree::TestingSupport::ControllerRequests, type: :controller
-#   end
-#
-# Then, in your controller tests, you can access spree routes like this:
-#
-#   require 'spec_helper'
-#
-#   describe Spree::ProductsController do
-#     it "can see all the products" do
-#       spree_get :index
-#     end
-#   end
-#
-# Use spree_get, spree_post, spree_put or spree_delete to make requests
-# to the Spree engine, and use regular get, post, put or delete to make
-# requests to your application.
-#
 module Spree
   module TestingSupport
     module ControllerRequests
@@ -33,46 +8,81 @@ module Spree
       end
 
       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.
+          Please use get, params: {}
+        DEPRECATION
         process_spree_action(action, parameters, session, flash, 'GET')
       end
 
       # 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.
+          Please use post, params: {}
+        DEPRECATION
         process_spree_action(action, parameters, session, flash, 'POST')
       end
 
       # 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.
+          Please use put, params: {}
+        DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PUT')
       end
 
-      # Executes a request simulating PATCH HTTP method and set/volley the response
+      # # 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.
+          Please use patch, params: {}
+        DEPRECATION
         process_spree_action(action, parameters, session, flash, 'PATCH')
       end
 
       # 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.
+          Please use delete, params: {}
+        DEPRECATION
         process_spree_action(action, parameters, session, flash, 'DELETE')
       end
 
       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.
+        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.
+        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.
+        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.
+        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.
+        DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :delete)
       end
 

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

@@ -1,11 +1,7 @@
 FactoryBot.define do
   factory :image, class: Spree::Image do
-    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
+    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

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :return_item, class: Spree::ReturnItem do
-    association(:inventory_unit, factory: :inventory_unit, state: :shipped)
-    association(:return_authorization, factory: :return_authorization)
+    association(:inventory_unit, factory: :inventory_unit, state: :shipped, strategy: :create)
+    association(:return_authorization, factory: :return_authorization, strategy: :create)
 
     factory :exchange_return_item do
       after(:build) do |return_item|

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :taxon, class: Spree::Taxon do
     sequence(:name) { |n| "taxon_#{n}" }
-    taxonomy
+    association(:taxonomy, strategy: :create)
     parent_id { taxonomy.root.id }
   end
 end

data/lib/spree/testing_support/i18n.rb

@@ -32,14 +32,12 @@ module Spree
       root = translations
       processed_keys = []
       translation_keys.each do |key|
-        begin
-          root = root.fetch(key.to_sym)
-          processed_keys << key.to_sym
-        rescue KeyError
-          error = "#{(processed_keys << key).join('.')} (#{I18n.locale})"
-          unless Spree.missing_translation_messages.include?(error)
-            Spree.missing_translation_messages << error
-          end
+        root = root.fetch(key.to_sym)
+        processed_keys << key.to_sym
+      rescue KeyError
+        error = "#{(processed_keys << key).join('.')} (#{I18n.locale})"
+        unless Spree.missing_translation_messages.include?(error)
+          Spree.missing_translation_messages << error
         end
       end
     end