[pull] main from solidusio:main

.circleci/config.yml

@@ -224,7 +224,8 @@ commands:
             cd /tmp/dummy_extension
             bundle init
             bundle add rails -v "< 7.1" --skip-install
-            bundle add sqlite3 <<parameters.extra_gems>> --skip-install
+            bundle add sqlite3 -v "~> 1.3" --skip-install
+            test -n "<<parameters.extra_gems>>" && bundle add <<parameters.extra_gems>> --skip-install
             bundle add solidus --path "$(ruby -e"puts File.expand_path ENV['CIRCLE_WORKING_DIRECTORY']")"
             export LIB_NAME=set # dummy requireable file
             bundle exec rake -rrails -rspree/testing_support/extension_rake -e'Rake::Task["extension:test_app"].invoke'

Gemfile

@@ -19,6 +19,7 @@ dbs = ENV['DB_ALL'] ? 'all' : ENV.fetch('DB', 'sqlite')
 gem 'mysql2', '~> 0.5.0', require: false if dbs.match?(/all|mysql/)
 gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/)
 gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/)
+gem 'sqlite3', '~> 1.4', require: false if dbs.match?(/all|sqlite/)
 
 gem 'database_cleaner', '~> 2.0', require: false
 gem 'rspec-activemodel-mocks', '~> 1.1', require: false
@@ -56,6 +57,13 @@ group :admin do
   gem 'axe-core-capybara', '~> 4.8', require: false
 end
 
+group :legacy_promotions do
+  gem 'solidus_legacy_promotions', path: 'legacy_promotions', require: false
+  gem 'solidus_admin', path: 'admin', require: false
+  gem 'axe-core-rspec', '~> 4.8', require: false
+  gem 'axe-core-capybara', '~> 4.8', require: false
+end
+
 group :lint do
   gem 'erb-formatter', '~> 0.7', require: false
   gem 'rubocop', '~> 1', require: false

admin/lib/solidus_admin.rb

@@ -2,7 +2,6 @@
 
 require "solidus_core"
 require "solidus_backend"
-require "solidus_legacy_promotions"
 
 module SolidusAdmin
   require "solidus_admin/version"

admin/lib/solidus_admin/configuration.rb

@@ -111,13 +111,6 @@ def menu_items
           ]
         },
 
-        {
-          key: "promotions",
-          route: -> { spree.admin_promotions_path },
-          icon: "megaphone-line",
-          position: 30,
-        },
-
         {
           key: "stock",
           route: -> { spree.admin_stock_items_path },

admin/solidus_admin.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'geared_pagination', '~> 1.1'
   s.add_dependency 'importmap-rails', '~> 1.2', '>= 1.2.1'
   s.add_dependency 'solidus_backend'
-  s.add_dependency 'solidus_legacy_promotions'
   s.add_dependency 'solidus_core', '> 4.2'
   s.add_dependency 'stimulus-rails', '~> 1.2'
   s.add_dependency 'turbo-rails', '~> 2.0'

core/lib/spree/core/null_promotion_configuration.rb

@@ -22,6 +22,14 @@ class NullPromotionConfiguration < Spree::Preferences::Configuration
       #   Spree::NullPromotionFinder.
       class_name_attribute :promotion_finder_class, default: 'Spree::NullPromotionFinder'
 
+      # Allows providing a different promotion shipping promotion handler.
+      # @!attribute [rw] shipping_promotion_handler_class
+      # @see Spree::NullPromotionHandler
+      # @return [Class] an object that conforms to the API of
+      #   the standard promotion finder class
+      #   Spree::NullPromotionHandler.
+      class_name_attribute :shipping_promotion_handler_class, default: 'Spree::NullPromotionHandler'
+
       # !@attribute [rw] promotion_api_attributes
       #   @return [Array<Symbol>] Attributes to be returned by the API for a promotion
       preference :promotion_api_attributes, :array, default: []

core/spec/lib/spree/core/null_promotion_configuration_spec.rb

@@ -16,4 +16,8 @@
   it "uses the null promotion finder class by default" do
     expect(config.promotion_finder_class).to eq Spree::NullPromotionFinder
   end
+
+  it "uses the null promotion handler as the shipping promo handler" do
+    expect(config.shipping_promotion_handler_class).to eq Spree::NullPromotionHandler
+  end
 end

legacy_promotions/config/routes.rb

@@ -14,3 +14,13 @@
     resources :promotion_categories, except: [:show]
   end
 end
+
+if SolidusSupport.admin_available?
+  SolidusAdmin::Engine.routes.draw do
+    require "solidus_admin/admin_resources"
+    extend SolidusAdmin::AdminResources
+
+    admin_resources :promotions, only: [:index, :destroy]
+    admin_resources :promotion_categories, only: [:index, :destroy]
+  end
+end

legacy_promotions/lib/solidus_legacy_promotions.rb

@@ -5,6 +5,14 @@
 require "solidus_backend"
 require "solidus_support"
 
+# If `solidus_admin` is available, it needs to load before
+# our engine is initialized, so that our load paths can
+# be initialized.
+begin
+  require 'solidus_admin'
+rescue LoadError
+  # Solidus Admin is not available
+end
 module SolidusLegacyPromotions
   VERSION = Spree.solidus_version
 end

legacy_promotions/lib/solidus_legacy_promotions/engine.rb

@@ -28,6 +28,19 @@ class Engine < ::Rails::Engine
       Spree::Backend::Config.menu_items.insert(product_menu_item_index + 1, promotions_menu_item)
     end
 
+    initializer "solidus_legacy_promotions.add_solidus_admin_menu_items" do
+      if SolidusSupport.admin_available?
+        SolidusAdmin::Config.configure do |config|
+          config.menu_items << {
+            key: "promotions",
+            route: -> { spree.admin_promotions_path },
+            icon: "megaphone-line",
+            position: 30
+          }
+        end
+      end
+    end
+
     initializer "solidus_legacy_promotions.assets" do |app|
       app.config.assets.precompile << "solidus_legacy_promotions/manifest.js"
     end

legacy_promotions/spec/features/admin/promotions/promotion_spec.rb → legacy_promotions/spec/features/backend/promotions/promotion_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.feature 'Promotions' do
   stub_authorization!

admin/spec/features/promotion_cateogries_spec.rb → legacy_promotions/spec/features/solidus_admin/promotion_categories_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe "Promotion Categories", :js, type: :feature do
+RSpec.describe "Promotion Categories", :js, type: :feature, solidus_admin: true do
   before { sign_in create(:admin_user, email: 'admin@example.com') }
 
   it "lists promotion categories and allows deleting them" do

admin/spec/features/promotions_spec.rb → legacy_promotions/spec/features/solidus_admin/promotions_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe "Promotions", :js, type: :feature do
+RSpec.describe "Promotions", :js, type: :feature, solidus_admin: true do
   before { sign_in create(:admin_user, email: 'admin@example.com') }
 
   it "lists promotions and allows deleting them" do

legacy_promotions/spec/rails_helper.rb

@@ -4,12 +4,30 @@
 
 ENV["RAILS_ENV"] ||= 'test'
 
+# SOLIDUS DUMMY APP
 require 'spree/testing_support/dummy_app'
 DummyApp.setup(
   gem_root: File.expand_path('..', __dir__),
   lib_name: 'solidus_legacy_promotions'
 )
 
+DummyApp.mattr_accessor :use_solidus_admin
+
+# Calling `draw` will completely rewrite the routes defined in the dummy app,
+# so we need to include the main solidus route.
+DummyApp::Application.routes.draw do
+  mount SolidusAdmin::Engine, at: "/admin", constraints: ->(_req) {
+    DummyApp.use_solidus_admin
+  }
+  mount Spree::Core::Engine, at: "/"
+end
+
+unless SolidusAdmin::Engine.root.join('app/assets/builds/solidus_admin/tailwind.css').exist?
+  Dir.chdir(SolidusAdmin::Engine.root) do
+    system 'bundle exec rake tailwindcss:build' or abort 'Failed to build Tailwind CSS'
+  end
+end
+
 require 'rails-controller-testing'
 require 'rspec/rails'
 require 'rspec-activemodel-mocks'
@@ -25,6 +43,7 @@
 require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/controller_requests'
+require "solidus_admin/testing_support/feature_helpers"
 require 'cancan/matchers'
 require 'spree/testing_support/capybara_ext'
 
@@ -51,6 +70,10 @@
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 
+# AXE - ACCESSIBILITY
+require 'axe-rspec'
+require 'axe-capybara'
+
 Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_chrome_headless).to_sym
 
 RSpec.configure do |config|
@@ -72,8 +95,14 @@
     Rails.cache.clear
   end
 
-  config.include Spree::TestingSupport::JobHelpers
+  config.around :each, :solidus_admin do |example|
+    DummyApp.use_solidus_admin = true
+    example.run
+    DummyApp.use_solidus_admin = false
+  end
 
+  config.include Spree::TestingSupport::JobHelpers
+  config.include SolidusAdmin::TestingSupport::FeatureHelpers, type: :feature
   config.include FactoryBot::Syntax::Methods
   config.include Spree::Api::TestingSupport::Helpers, type: :request
   config.include Spree::TestingSupport::UrlHelpers, type: :controller

lib/solidus.rb

@@ -4,3 +4,4 @@
 require 'solidus_api'
 require 'solidus_backend'
 require 'solidus_sample'
+require 'solidus_legacy_promotions'