spree_core 4.0.0 → 4.5.1

data/lib/spree/testing_support/capybara_ext.rb

@@ -32,51 +32,6 @@ module CapybaraExt
     end
   end
 
-  def select2_search(value, options)
-    options[:from] = select2_from_label(options[:from])
-    targetted_select2_search(value, options)
-  end
-
-  def targetted_select2_search(value, options)
-    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)
-    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
-      "##{find('.select2-container')['id']}"
-    end
-  end
-
-  def select2_no_label(value, options = {})
-    raise "Must pass a hash containing 'from'" if !options.is_a?(Hash) || !options.key?(:from)
-
-    placeholder = options[:from]
-    click_link placeholder
-
-    select_select2_result(value)
-  end
-
-  def targetted_select2(value, options)
-    # find select2 element and click it
-    find(options[:from]).find('a').click
-    select_select2_result(value)
-  end
-
-  def select_select2_result(value)
-    # results are in a div appended to the end of the document
-    page.document.find('div.select2-result-label', match: :first, text: %r{#{Regexp.escape(value)}}i).click
-  end
-
   # arg delay in seconds
   def wait_for_ajax(delay = Capybara.default_max_wait_time)
     Timeout.timeout(delay) do
@@ -104,15 +59,10 @@ 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
+rescue Selenium::WebDriver::Error::TimeoutError
   default_options[:error].nil? ? false : raise(default_options[:error])
 end
 
-Capybara.configure do |config|
-  config.match = :smart
-  config.ignore_hidden_elements = true
-end
-
 RSpec::Matchers.define :have_meta do |name, expected|
   match do |_actual|
     has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)

data/lib/spree/testing_support/common_rake.rb

@@ -8,19 +8,44 @@ require 'generators/spree/dummy_model/dummy_model_generator'
 desc 'Generates a dummy app for testing'
 namespace :common do
   task :test_app, :user_class do |_t, args|
-    args.with_defaults(user_class: 'Spree::LegacyUser')
+    args.with_defaults(user_class: 'Spree::LegacyUser', install_storefront: 'false', install_admin: 'false')
     require ENV['LIB_NAME'].to_s
 
     ENV['RAILS_ENV'] = 'test'
     Rails.env = 'test'
 
+    if ENV['LIB_NAME'] == 'spree/backend'
+      puts 'Preparing NPM package...'
+      system('yarn install')
+      system('yarn build')
+      system('yarn link')
+    end
+
     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_views=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=#{args[:install_storefront]}",
+      "--install_admin=#{args[:install_admin]}",
+      "--user_class=#{args[:user_class]}"
+    ]
 
     puts 'Setting up dummy database...'
-    system("bundle exec rake db:drop db:create > #{File::NULL}")
+    system('bin/rails db:environment:set RAILS_ENV=test')
+    system('bundle exec rake db:drop db:create')
     Spree::DummyModelGenerator.start
-    system("bundle exec rake db:migrate > #{File::NULL}")
+    system('bundle exec rake db:migrate')
+
+    unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+      puts 'Setting up node environment'
+      system('bin/rails javascript:install:esbuild')
+      system('bin/rails turbo:install')
+    end
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
@@ -30,12 +55,19 @@ namespace :common do
       puts 'Skipping installation no generator to run...'
     end
 
-    puts 'Precompiling assets...'
-    system("bundle exec rake assets:precompile > #{File::NULL}")
+    unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+      if ENV['LIB_NAME'] == 'spree/backend'
+        puts 'Installing node dependencies...'
+        system('yarn link @spree/dashboard')
+        system('yarn install')
+      end
+      puts 'Precompiling assets...'
+      system('bundle exec rake assets:precompile')
+    end
   end
 
   task :seed do |_t|
     puts 'Seeding ...'
-    system("bundle exec rake db:seed RAILS_ENV=test > #{File::NULL}")
+    system('bundle exec rake db:seed RAILS_ENV=test')
   end
 end

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

@@ -2,8 +2,8 @@ require 'spree/testing_support/common_rake'
 
 desc 'Generates a dummy app for testing an extension'
 namespace :extension do
-  task :test_app, [:user_class] do |_t, _args|
+  task :test_app, [:user_class] do |_t, args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
-    Rake::Task['common:test_app'].invoke
+    Rake::Task['common:test_app'].execute(args.with_defaults(install_admin: true, install_storefront: true))
   end
 end

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     firstname         { 'John' }
     lastname          { 'Doe' }
     company           { 'Company' }
-    address1          { '10 Lovely Street' }
+    sequence(:address1) { |n| "#{n} Lovely Street" }
     address2          { 'Northwest' }
     city              { 'Herndon' }
     zipcode           { '35005' }

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

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :asset, class: Spree::Asset do
+    viewable_type {}
+    viewable_id {}
+    attachment_width { 340 }
+    attachment_height { 280 }
+    attachment_file_size { 128 }
+    position { 1 }
+    attachment_content_type { '.jpg' }
+    attachment_file_name { 'attachment.jpg' }
+    type {}
+    attachment_updated_at {}
+    alt {}
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :classification, class: Spree::Classification do
+    product
+    taxon
+
+    position { 1 }
+  end
+end

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

@@ -0,0 +1,20 @@
+FactoryBot.define do
+  factory :base_cms_page, class: Spree::CmsPage do
+    title { generate(:random_string) }
+    locale { 'en' }
+
+    store
+
+    factory :cms_homepage do
+      type { 'Spree::Cms::Pages::Homepage' }
+    end
+
+    factory :cms_standard_page do
+      type { 'Spree::Cms::Pages::StandardPage' }
+    end
+
+    factory :cms_feature_page do
+      type { 'Spree::Cms::Pages::FeaturePage' }
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+FactoryBot.define do
+  factory :base_cms_section, class: Spree::CmsSection do
+    name { generate(:random_string) }
+
+    association :cms_page, factory: :cms_feature_page
+
+    factory :cms_hero_image_section do
+      type { 'Spree::Cms::Sections::HeroImage' }
+    end
+
+    factory :cms_featured_article_section do
+      type { 'Spree::Cms::Sections::FeaturedArticle' }
+    end
+
+    factory :cms_product_carousel_section do
+      type { 'Spree::Cms::Sections::ProductCarousel' }
+    end
+
+    factory :cms_image_gallery_section do
+      type { 'Spree::Cms::Sections::ImageGallery' }
+    end
+
+    factory :cms_side_by_side_images_section do
+      type { 'Spree::Cms::Sections::SideBySideImages' }
+    end
+
+    factory :cms_rich_text_content_section do
+      type { 'Spree::Cms::Sections::RichTextContent' }
+    end
+  end
+end

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

@@ -1,29 +1,36 @@
 FactoryBot.define do
-  factory :customer_return, class: Spree::CustomerReturn do
+  # for the case when you want to supply existing return items instead of generating some
+  factory :customer_return_without_return_items, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)
 
-    transient do
-      line_items_count   { 1 }
-      return_items_count { line_items_count }
+    before(:create) do |customer_return, _evaluator|
+      if customer_return.store.nil?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        customer_return.store = store
+      end
     end
 
-    before(:create) do |customer_return, evaluator|
-      shipped_order = create(:shipped_order, line_items_count: evaluator.line_items_count)
+    factory :customer_return, class: Spree::CustomerReturn do
+      transient do
+        line_items_count   { 1 }
+        return_items_count { line_items_count }
+      end
+
+      before(:create) do |customer_return, evaluator|
+        shipped_order = create(:shipped_order, line_items_count: evaluator.line_items_count, store: customer_return.store)
 
-      shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
-        customer_return.return_items << build(:return_item, inventory_unit: inventory_unit)
+        shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
+          customer_return.return_items << build(:return_item, inventory_unit: inventory_unit)
+        end
       end
-    end
 
-    factory :customer_return_with_accepted_items do
-      after(:create) do |customer_return|
-        customer_return.return_items.each(&:accept!)
+      factory :customer_return_with_accepted_items do
+        after(:create) do |customer_return|
+          customer_return.return_items.each(&:accept!)
+        end
       end
     end
   end
-
-  # for the case when you want to supply existing return items instead of generating some
-  factory :customer_return_without_return_items, class: Spree::CustomerReturn do
-    association(:stock_location, factory: :stock_location)
-  end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :digital, class: Spree::Digital do
+    after(:build) do |digital|
+      digital.attachment.attach(io: File.new("#{Spree::Core::Engine.root}/spec/fixtures/thinking-cat.jpg"),
+                                filename: 'thinking-cat.jpg')
+    end
+
+    variant
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :digital_link, class: Spree::DigitalLink do
+    digital
+    line_item
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :favicon_image, class: Spree::StoreFaviconImage do
+    transient do
+      filepath { Spree::Core::Engine.root.join('spec', 'fixtures', 'favicon.ico') }
+    end
+
+    attachment { Rack::Test::UploadedFile.new(filepath) }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :icon, class: Spree::Icon do
+    before(:create) do |icon|
+      if icon.respond_to? :attachment
+        icon.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/image_factory.rb

@@ -1,7 +1,9 @@
 FactoryBot.define do
   factory :image, class: Spree::Image do
     before(:create) do |image|
-      image.attachment.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg'), filename: 'thinking-cat.jpg')
+      if image.class.method_defined?(:attachment)
+        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/line_item_factory.rb

@@ -4,8 +4,12 @@ FactoryBot.define do
     quantity { 1 }
     price    { BigDecimal('10.00') }
     currency { order.currency }
-    transient do
-      association :product
+    product do
+      if order&.store&.present?
+        create(:product, stores: [order.store])
+      else
+        create(:product)
+      end
     end
     variant { product.master }
   end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :log_entry, class: Spree::LogEntry do
+    source { build(:order) }
+    details { 'Some details' }
+  end
+end

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

@@ -0,0 +1,16 @@
+FactoryBot.define do
+  factory :menu, class: Spree::Menu do
+    name { generate(:random_string) }
+    locale { 'en' }
+    location { 'Header' }
+
+    before(:create) do |menu|
+      if menu.store.nil?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        menu.store = store
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :menu_item, class: Spree::MenuItem do
+    sequence(:name) { |n| "Link no. #{n} To Somewhere" }
+    item_type { 'Link' }
+    linked_resource_type { 'Spree::Linkable::Uri' }
+
+    menu
+    icon
+  end
+end

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

@@ -5,8 +5,23 @@ FactoryBot.define do
     option_type
   end
 
+  factory :option_value_variant, class: Spree::OptionValueVariant do
+    option_value
+    variant
+  end
+
   factory :option_type, class: Spree::OptionType do
     sequence(:name) { |n| "foo-size-#{n}" }
     presentation    { 'Size' }
+
+    trait :size do
+      name { 'size' }
+      presentation { 'Size' }
+    end
+
+    trait :color do
+      name { 'color' }
+      presentation { 'Color' }
+    end
   end
 end

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

@@ -2,13 +2,22 @@ FactoryBot.define do
   factory :order, class: Spree::Order do
     user
     bill_address
-    store
     completed_at { nil }
-    email        { user.email }
+    email        { user&.email }
     currency     { 'USD' }
 
     transient do
       line_items_price { BigDecimal(10) }
+      attach_to_default_store { true }
+    end
+
+    before(:create) do |order|
+      unless order.store.present?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        order.store = store
+      end
     end
 
     factory :order_with_totals do
@@ -46,7 +55,8 @@ FactoryBot.define do
           order.line_items.reload
         end
 
-        create(:shipment, order: order, cost: evaluator.shipment_cost)
+        stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
+        create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
         order.shipments.reload
 
         order.update_with_updater!
@@ -68,7 +78,10 @@ FactoryBot.define do
 
         factory :completed_order_with_store_credit_payment do
           after(:create) do |order|
-            create(:store_credit_payment, amount: order.total, order: order)
+            store_credit = create(:store_credit, amount: order.total, store: order.store, user: order.user)
+            payment_method = create(:store_credit_payment_method, stores: [order.store])
+
+            create(:store_credit_payment, amount: order.total, order: order, source: store_credit, payment_method: payment_method)
           end
         end
 

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :payment_capture_event, class: Spree::PaymentCaptureEvent do
+    payment
+    amount { 10.0 }
+  end
+end

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

@@ -5,7 +5,7 @@ FactoryBot.define do
     state         { 'checkout' }
     response_code { '12345' }
 
-    association(:payment_method, factory: :credit_card_payment_method)
+    payment_method { create(:credit_card_payment_method, stores: [order.store]) }
     association(:source, factory: :credit_card)
 
     factory :payment_with_refund do
@@ -24,7 +24,7 @@ FactoryBot.define do
   end
 
   factory :store_credit_payment, class: Spree::Payment, parent: :payment do
-    association(:payment_method, factory: :store_credit_payment_method)
-    association(:source, factory: :store_credit)
+    payment_method { create(:store_credit_payment_method, stores: [order.store]) }
+    source { create(:store_credit, store: order.store, user: order.user) }
   end
 end

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

@@ -1,19 +1,36 @@
 FactoryBot.define do
-  factory :check_payment_method, class: Spree::PaymentMethod::Check do
+  factory :payment_method, class: Spree::PaymentMethod do
+    type { 'Spree::PaymentMethod' }
+    name { 'Test' }
+
+    before(:create) do |payment_method|
+      if payment_method.stores.empty?
+        default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+        store = default_store || create(:store)
+
+        payment_method.stores << store
+      end
+    end
+  end
+
+  factory :check_payment_method, parent: :payment_method, class: Spree::PaymentMethod::Check do
+    type { 'Spree::PaymentMethod::Check' }
     name { 'Check' }
   end
 
-  factory :credit_card_payment_method, class: Spree::Gateway::Bogus do
+  factory :credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::Bogus do
+    type { 'Spree::Gateway::Bogus' }
     name { 'Credit Card' }
   end
 
   # authorize.net was moved to spree_gateway.
   # Leaving this factory in place with bogus in case anyone is using it.
-  factory :simple_credit_card_payment_method, class: Spree::Gateway::BogusSimple do
+  factory :simple_credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::BogusSimple do
+    type { 'Spree::Gateway::BogusSimple' }
     name { 'Credit Card' }
   end
 
-  factory :store_credit_payment_method, class: Spree::PaymentMethod::StoreCredit do
+  factory :store_credit_payment_method, parent: :payment_method, class: Spree::PaymentMethod::StoreCredit do
     type          { 'Spree::PaymentMethod::StoreCredit' }
     name          { 'Store Credit' }
     description   { 'Store Credit' }