AlchemyCMS · tvdeyen · Mar 31, 2023 · Mar 17, 2023 · Mar 17, 2023 · Mar 30, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,25 +11,27 @@ jobs:
         ruby-version:
           - "3.0"
           - "3.1"
+          - "3.2"
         alchemy:
-          - "6.0"
-          - "6.1"
+          - "7.0.0-a"
         solidus:
           - "3.2"
           - "3.3"
     env:
       ALCHEMY_VERSION: ${{ matrix.alchemy }}
       SOLIDUS_VERSION: ${{ matrix.solidus }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
       - name: Set up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 14
+      - name: Prepare tests
+        run: bundle exec rake test_setup
       - name: Run tests
-        run: bundle exec rake
+        run: bundle exec rspec
diff --git a/Gemfile b/Gemfile
@@ -5,16 +5,16 @@ gem "solidus_core", "~> #{solidus_version}.0"
 gem "solidus_frontend", "~> #{solidus_version}.0"
 gem "solidus_backend", "~> #{solidus_version}.0"
 
-alchemy_version = ENV.fetch("ALCHEMY_VERSION", "6.1")
-gem "alchemy_cms", "~> #{alchemy_version}.0"
-gem "alchemy-devise", "~> #{alchemy_version}.0"
+gem "alchemy_cms", "~> 7.0.0-a"
+gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
 
 # Specify your gem's dependencies in alchemy-solidus.gemspec
 gemspec
 
 gem "sqlite3"
 gem "pry-rails"
-gem "sprockets", "< 4"
+gem "sprockets", "~> 4.0"
+gem "jsbundling-rails", "~> 1.1"
 gem "rails", "~> 6.1.0"
 gem "listen"
 gem "puma"

diff --git a/Rakefile b/Rakefile
@@ -27,8 +27,10 @@ task :test_setup do
       bin/rails g gutentag:migration_versions && \
       bin/rails g solidus:install --force --auto-accept --no-seed --no-sample #{solidus_install_options} && \
       bin/rails g solidus_frontend:install --force --auto-accept && \
+      bin/rails javascript:install:esbuild && \
       bin/rails g alchemy:solidus:install --auto-accept --force && \
-      bin/rake db:test:prepare
+      bin/rake db:test:prepare && \
+      bin/rails javascript:build
     SETUP
     exit($?.exitstatus) unless $?.success?
   end

diff --git a/alchemy-solidus.gemspec b/alchemy-solidus.gemspec
@@ -13,13 +13,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version = Alchemy::Solidus::VERSION
 
-  gem.add_dependency("alchemy_cms", [">= 6.0.0", "< 7"])
+  gem.add_dependency("alchemy_cms", [">= 7.0.0.a", "< 8"])
   gem.add_dependency("solidus_core", [">= 3.0.0", "< 4.0"])
   gem.add_dependency("solidus_backend", [">= 3.0.0", "< 4.0"])
   gem.add_dependency("solidus_support", [">= 0.1.1"])
   gem.add_dependency("deface", ["~> 1.0"])
 
-  gem.add_development_dependency("rspec-rails", ["~> 5.0"])
+  gem.add_development_dependency("rspec-rails", ["~> 6.0"])
   gem.add_development_dependency("shoulda-matchers", ["~> 4.0"])
   gem.add_development_dependency("capybara", ["~> 2.15"])
   gem.add_development_dependency("capybara-screenshot", ["~> 1.0"])

diff --git a/app/models/alchemy/essence_spree_product.rb b/app/models/alchemy/essence_spree_product.rb
diff --git a/app/models/alchemy/essence_spree_taxon.rb b/app/models/alchemy/essence_spree_taxon.rb
diff --git a/app/models/alchemy/essence_spree_variant.rb b/app/models/alchemy/essence_spree_variant.rb
diff --git a/app/views/alchemy/essences/_essence_spree_product_editor.html.erb b/app/views/alchemy/essences/_essence_spree_product_editor.html.erb
diff --git a/app/views/alchemy/essences/_essence_spree_product_view.html.erb b/app/views/alchemy/essences/_essence_spree_product_view.html.erb
diff --git a/app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb b/app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb
diff --git a/app/views/alchemy/essences/_essence_spree_taxon_view.html.erb b/app/views/alchemy/essences/_essence_spree_taxon_view.html.erb
diff --git a/app/views/alchemy/essences/_essence_spree_variant_editor.html.erb b/app/views/alchemy/essences/_essence_spree_variant_editor.html.erb
diff --git a/app/views/alchemy/essences/_essence_spree_variant_view.html.erb b/app/views/alchemy/essences/_essence_spree_variant_view.html.erb
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
@@ -1,5 +1,3 @@
-
 //= link_tree ../images
-//= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
-//= link rails5_engine_manifest.js
+//= link_tree ../builds
diff --git a/spec/dummy/app/views/alchemy/elements/_all_you_can_eat.html.erb b/spec/dummy/app/views/alchemy/elements/_all_you_can_eat.html.erb
@@ -0,0 +1,13 @@
+<%- cache(all_you_can_eat) do -%>
+  <%= element_view_for(all_you_can_eat) do |el| -%>
+    <div class="product">
+      <%= el.render(:product) %>
+    </div>
+    <div class="variant">
+      <%= el.render(:variant) %>
+    </div>
+    <div class="taxon">
+      <%= el.render(:taxon) %>
+    </div>
+  <%- end -%>
+<%- end -%>
diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb
@@ -5,7 +5,7 @@
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all' %>
-    <%= javascript_include_tag 'application' %>
+    <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
   </head>
 
   <body>

diff --git a/spec/dummy/config/alchemy/elements.yml b/spec/dummy/config/alchemy/elements.yml
@@ -0,0 +1,4 @@
+# == In this configuration, you set up Alchemy's element layouts.
+#
+# For further information please see http://guides.alchemy-cms.com/stable/elements.html
+
diff --git a/spec/dummy/db/seeds.rb b/spec/dummy/db/seeds.rb
@@ -0,0 +1,4 @@
+
+Spree::Core::Engine.load_seed if defined?(Spree::Core)
+Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
+Alchemy::Seeder.seed!
diff --git a/spec/dummy/package.json b/spec/dummy/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "app",
+  "private": "true",
+  "dependencies": {
+    "@alchemy_cms/admin": "~7.0.0-a",
+    "esbuild": "^0.17.14"
+  },
+  "scripts": {
+    "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=assets"
+  }
+}
diff --git a/spec/features/alchemy/alchemy_admin_integrations_spec.rb b/spec/features/alchemy/alchemy_admin_integrations_spec.rb
@@ -1,6 +1,5 @@
 require "alchemy/version"
 require "rails_helper"
-require "alchemy/devise/test_support/factories"
 
 RSpec.feature "Admin Integration", type: :feature do
   let!(:user) do

diff --git a/spec/models/alchemy/essence_spree_product_spec.rb b/spec/models/alchemy/essence_spree_product_spec.rb