solidus_core 2.9.6 → 2.11.0

data/lib/spree/preferences/static_model_preferences.rb

@@ -30,8 +30,8 @@ module Spree
       end
 
       def initialize
-        @store = Hash.new do |h, klass|
-          h[klass] = {}
+        @store = Hash.new do |data, klass|
+          data[klass] = {}
         end
       end
 

data/lib/spree/testing_support/ability_helpers.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 RSpec.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
@@ -18,8 +18,8 @@ RSpec.shared_examples_for 'access granted' do
 end
 
 RSpec.shared_examples_for 'access denied' do
-  it 'should not allow read' do
-    expect(ability).to_not be_able_to(:read, resource)
+  it 'should not allow show' do
+    expect(ability).to_not be_able_to(:show, resource)
   end
 
   it 'should not allow create' do
@@ -61,8 +61,8 @@ RSpec.shared_examples_for 'create only' do
     expect(ability).to be_able_to(:create, resource)
   end
 
-  it 'should not allow read' do
-    expect(ability).to_not be_able_to(:read, resource)
+  it 'should not allow show' do
+    expect(ability).to_not be_able_to(:show, resource)
   end
 
   it 'should not allow update' do
@@ -93,8 +93,8 @@ RSpec.shared_examples_for 'update only' do
     expect(ability).to_not be_able_to(:create, resource)
   end
 
-  it 'should not allow read' do
-    expect(ability).to_not be_able_to(:read, resource)
+  it 'should not allow show' do
+    expect(ability).to_not be_able_to(:show, resource)
   end
 
   it 'should allow update' do

data/lib/spree/testing_support/authorization_helpers.rb

@@ -65,4 +65,5 @@ RSpec.configure do |config|
   config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
   config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
   config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :request
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
 end

data/lib/spree/testing_support/blacklist_urls.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Spree
+  module TestingSupport
+    module BlacklistUrls
+      def setup_url_blacklist(browser)
+        if browser.respond_to?(:url_blacklist)
+          browser.url_blacklist = ['http://fonts.googleapis.com']
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:each, type: :feature) do
+    setup_url_blacklist(page.driver.browser)
+  end
+
+  config.before(:each, type: :system) do
+    setup_url_blacklist(page.driver.browser)
+  end
+end

data/lib/spree/testing_support/capybara_ext.rb

@@ -162,3 +162,6 @@ CapybaraExt = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('CapybaraE
 RSpec.configure do |c|
   c.include Spree::TestingSupport::CapybaraExt
 end
+
+# A workaround for https://github.com/rspec/rspec-rails/issues/1897
+Capybara.server = :puma, { Silent: true }

data/lib/spree/testing_support/common_rake.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-unless defined?(Spree::InstallGenerator)
-  require 'generators/spree/install/install_generator'
+unless defined?(Solidus::InstallGenerator)
+  require 'generators/solidus/install/install_generator'
 end
 
 require 'generators/spree/dummy/dummy_generator'
@@ -14,7 +14,7 @@ namespace :common do
     ENV["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", "--user_class=#{args[:user_class]}"]
+    Solidus::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--auto-accept", "--with-authentication=false", "--payment-method=none", "--migrate=false", "--seed=false", "--sample=false", "--quiet", "--user_class=#{args[:user_class]}"]
 
     puts "Setting up dummy database..."
 

data/lib/spree/testing_support/dummy_app.rb

@@ -12,13 +12,10 @@ Rails.env = 'test'
 
 require 'solidus_core'
 
-RAILS_52_OR_ABOVE = Gem::Version.new(Rails.version) >= Gem::Version.new('5.2')
+RAILS_6_OR_ABOVE = Rails.gem_version >= Gem::Version.new('6.0')
 
 # @private
 class ApplicationController < ActionController::Base
-  unless RAILS_52_OR_ABOVE
-    protect_from_forgery with: :exception
-  end
 end
 
 # @private
@@ -47,24 +44,37 @@ module DummyApp
   end
 
   class Application < ::Rails::Application
-    config.eager_load                                 = false
-    config.cache_classes                              = true
-    config.cache_store                                = :memory_store
-    config.serve_static_assets                        = true
-    config.public_file_server.headers                 = { 'Cache-Control' => 'public, max-age=3600' }
-    config.whiny_nils                                 = true
-    config.consider_all_requests_local                = true
+    config.eager_load = false
+    config.cache_classes = true
+    config.cache_store = :memory_store
+    config.serve_static_assets = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+    config.whiny_nils = true
+    config.consider_all_requests_local = true
     config.action_controller.allow_forgery_protection = true
-    config.action_controller.perform_caching          = false
-    config.action_dispatch.show_exceptions            = false
-    config.active_support.deprecation                 = :stderr
-    config.action_mailer.delivery_method              = :test
-    config.active_support.deprecation                 = :stderr
-    config.secret_key_base                            = 'SECRET_TOKEN'
-
-    if RAILS_52_OR_ABOVE
-      config.action_controller.default_protect_from_forgery = true
-      config.active_record.sqlite3.represent_boolean_as_integer = true
+    config.action_controller.default_protect_from_forgery = true
+    config.action_controller.perform_caching = false
+    config.action_dispatch.show_exceptions = false
+    config.active_support.deprecation = :stderr
+    config.action_mailer.delivery_method = :test
+    config.active_support.deprecation = :stderr
+    config.secret_key_base = 'SECRET_TOKEN'
+
+    config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
+    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
+
+    config.storage_path = Rails.root.join('tmp', 'storage')
+
+    if ENV['ENABLE_ACTIVE_STORAGE']
+      initializer 'solidus.active_storage' do
+        config.active_storage.service_configurations = {
+          test: {
+            service: 'Disk',
+            root: config.storage_path
+          }
+        }
+        config.active_storage.service = :test
+      end
     end
 
     # Avoid issues if an old spec/dummy still exists
@@ -104,7 +114,21 @@ end
 
 Spree.user_class = 'Spree::LegacyUser'
 Spree.config do |config|
+  config.use_legacy_address_state_validator = false
   config.mails_from = "store@example.com"
+  config.raise_with_invalid_currency = false
+  config.redirect_back_on_unauthorized = true
+  config.run_order_validations_on_order_updater = true
+  config.use_combined_first_and_last_name_in_address = true
+  config.use_legacy_order_state_machine = false
+  config.use_custom_cancancan_actions = false
+  config.consider_actionless_promotion_active = false
+  config.use_legacy_store_credit_reimbursement_category_name = false
+
+  if ENV['ENABLE_ACTIVE_STORAGE']
+    config.image_attachment_module = 'Spree::Image::ActiveStorageAttachment'
+    config.taxon_attachment_module = 'Spree::Taxon::ActiveStorageAttachment'
+  end
 end
 
 # Raise on deprecation warnings

data/lib/spree/testing_support/dummy_app/migrations.rb

@@ -15,12 +15,8 @@ module DummyApp
 
     def needs_migration?
       return true if !database_exists?
-      if ActiveRecord::Base.connection.respond_to?(:migration_context)
-        # Rails >= 5.2
-        ActiveRecord::Base.connection.migration_context.needs_migration?
-      else
-        ActiveRecord::Migrator.needs_migration?
-      end
+
+      ActiveRecord::Base.connection.migration_context.needs_migration?
     end
 
     def auto_migrate
@@ -31,6 +27,9 @@ module DummyApp
         ActiveRecord::Base.remove_connection
 
         sh 'rake db:reset VERBOSE=false'
+        if ENV['ENABLE_ACTIVE_STORAGE']
+          sh 'rake active_storage:install db:migrate VERBOSE=false'
+        end
 
         # We have a brand new database, so we must re-establish our connection
         ActiveRecord::Base.establish_connection

data/lib/spree/testing_support/dummy_app/rake_tasks.rb

@@ -38,11 +38,13 @@ namespace :db do
     # railties:install:migrations and then db:migrate.
     # Migrations should be run one directory at a time
     ActiveRecord::Migrator.migrations_paths.each do |path|
-      if defined?(ActiveRecord::MigrationContext)
-        # Rails >= 5.2
-        ActiveRecord::MigrationContext.new([path]).migrate
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        ActiveRecord::MigrationContext.new(
+          [path],
+          ActiveRecord::SchemaMigration
+        ).migrate
       else
-        ActiveRecord::Migrator.migrate(path)
+        ActiveRecord::MigrationContext.new([path]).migrate
       end
     end
 

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

@@ -11,8 +11,7 @@ FactoryBot.define do
       state_code { 'AL' }
     end
 
-    firstname { 'John' }
-    lastname { nil }
+    name { 'John Von Doe' }
     company { 'Company' }
     address1 { '10 Lovely Street' }
     address2 { 'Northwest' }

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

@@ -2,6 +2,6 @@
 
 FactoryBot.define do
   factory :image, class: 'Spree::Image' do
-    attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg') }
+    attachment { Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg').open }
   end
 end

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

@@ -9,6 +9,7 @@ FactoryBot.define do
   factory :inventory_unit, class: 'Spree::InventoryUnit' do
     transient do
       order { nil }
+      stock_location { nil }
     end
 
     variant
@@ -20,7 +21,13 @@ FactoryBot.define do
       end
     end
     state { 'on_hand' }
-    shipment { build(:shipment, state: 'pending', order: line_item.order) }
+    shipment do
+      if stock_location
+        build(:shipment, state: 'pending', order: line_item.order, stock_location: stock_location)
+      else
+        build(:shipment, state: 'pending', order: line_item.order)
+      end
+    end
     # return_authorization
   end
 end

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

@@ -16,6 +16,12 @@ FactoryBot.define do
       end
     end
 
+    trait :with_action do
+      after(:create) do |promotion, _evaluator|
+        promotion.actions << Spree::Promotion::Actions::CreateAdjustment.new
+      end
+    end
+
     trait :with_line_item_adjustment do
       transient do
         adjustment_rate { 10 }
@@ -27,8 +33,15 @@ FactoryBot.define do
         Spree::Promotion::Actions::CreateItemAdjustments.create!(calculator: calculator, promotion: promotion)
       end
     end
+
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
 
+    trait :with_free_shipping do
+      after(:create) do |promotion|
+        Spree::Promotion::Actions::FreeShipping.create!(promotion: promotion)
+      end
+    end
+
     trait :with_order_adjustment do
       transient do
         weighted_order_adjustment_amount { 10 }

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

@@ -13,6 +13,7 @@ FactoryBot.define do
 
     amount { 100.00 }
     transaction_id { generate(:refund_transaction_id) }
+    perform_after_create { false }
     payment do
       association(:payment, state: 'completed', amount: payment_amount)
     end

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

@@ -15,7 +15,7 @@ FactoryBot.define do
       if reimbursement.return_items.empty?
         reimbursement.return_items = reimbursement.customer_return.return_items
       end
-      reimbursement.total = reimbursement.return_items.map { |ri| ri.amount }.sum
+      reimbursement.total = reimbursement.return_items.sum(&:amount)
     end
   end
 end

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

@@ -6,7 +6,6 @@ require 'spree/testing_support/factories/return_authorization_factory'
 
 FactoryBot.define do
   factory :return_item, class: 'Spree::ReturnItem' do
-    skip_customer_return_processing { true }
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)
     association(:return_reason, factory: :return_reason)
     return_authorization do |_return_item|

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

@@ -17,7 +17,7 @@ FactoryBot.define do
 
     after(:build) do |package, evaluator|
       evaluator.variants_contents.each do |variant, count|
-        package.add_multiple build_list(:inventory_unit, count, variant: variant)
+        package.add_multiple build_list(:inventory_unit, count, variant: variant, stock_location: evaluator.stock_location)
       end
     end
 

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

@@ -3,5 +3,13 @@
 FactoryBot.define do
   factory :store_credit_category, class: 'Spree::StoreCreditCategory' do
     name { "Exchange" }
+
+    trait :reimbursement do
+      name { Spree::StoreCreditCategory::REIMBURSEMENT }
+    end
+
+    trait :gift_card do
+      name { Spree::StoreCreditCategory::GIFT_CARD }
+    end
   end
 end

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

@@ -8,6 +8,7 @@ FactoryBot.define do
     store_credit
     amount             { 100.00 }
     authorization_code { "#{store_credit.id}-SC-20140602164814476128" }
+    action               { Spree::StoreCredit::AUTHORIZE_ACTION }
 
     factory :store_credit_auth_event, class: 'Spree::StoreCreditEvent' do
       action             { Spree::StoreCredit::AUTHORIZE_ACTION }

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

@@ -2,6 +2,8 @@
 
 FactoryBot.define do
   factory :store_credit_reason, class: 'Spree::StoreCreditReason' do
-    name { "Input error" }
+    sequence :name do |n|
+      "Input error #{n}"
+    end
   end
 end

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

@@ -7,5 +7,9 @@ FactoryBot.define do
     name { 'Ruby on Rails' }
     taxonomy
     parent_id { nil }
+
+    trait :with_icon do
+      icon { Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg').open }
+    end
   end
 end

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

@@ -17,7 +17,10 @@ FactoryBot.define do
     end
 
     factory :admin_user do
-      spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
+      after(:create) do |user, _|
+        admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
+        user.spree_roles << admin_role
+      end
     end
 
     factory :user_with_addresses do |_u|

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

@@ -5,7 +5,7 @@ require 'spree/testing_support/factories/country_factory'
 
 FactoryBot.define do
   factory :global_zone, class: 'Spree::Zone' do
-    name { 'GlobalZone' }
+    initialize_with { Spree::Zone.find_or_initialize_by(name: 'GlobalZone') }
     zone_members do |proxy|
       zone = proxy.instance_eval { @instance }
       Spree::Country.all.map do |c|

data/lib/spree/testing_support/job_helpers.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Spree
+  module TestingSupport
+    module JobHelpers
+      def perform_enqueued_jobs
+        adapter = ActiveJob::Base.queue_adapter
+
+        old = adapter.perform_enqueued_jobs
+        old_at = adapter.perform_enqueued_at_jobs
+
+        begin
+          adapter.perform_enqueued_jobs = true
+          adapter.perform_enqueued_at_jobs = true
+
+          yield
+        ensure
+          adapter.perform_enqueued_jobs = old
+          adapter.perform_enqueued_at_jobs = old_at
+        end
+      end
+    end
+  end
+end