From eb666fe3211c569eeeca2b4217ff3dbf8b47b47d Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Fri, 29 Dec 2023 11:47:44 +0100
Subject: [PATCH 1/2] Test Alchemy 7.1.0-b1

---
 .github/workflows/ci.yml | 2 +-
 Gemfile                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85b5fc9..e3d486d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
           - "3.3"
         alchemy:
           - "7.0"
-          - "main"
+          - "7.1.0-b1"
         solidus:
           - "4.0"
           - "4.1"
diff --git a/Gemfile b/Gemfile
index 90cb937..968d0da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ alchemy_version = ENV.fetch("ALCHEMY_VERSION", "main")
 if alchemy_version == "main"
   gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: "main"
 else
-  gem "alchemy_cms", "~> #{alchemy_version}.0"
+  gem "alchemy_cms", "~> #{alchemy_version}"
 end
 
 gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"

From 8f8c716f1903e8a96cfb638cc540e9a961923cfb Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Fri, 29 Dec 2023 11:55:47 +0100
Subject: [PATCH 2/2] Remove Solidus 3.2 setup code

We only support Solidus 4.x now and can finally remove this
complicated setup code.
---
 Rakefile | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/Rakefile b/Rakefile
index 3991c9b..fbe6eb6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,25 +12,12 @@ RSpec::Core::RakeTask.new(:spec)
 
 task default: %i[test_setup spec]
 
-require "active_support/core_ext/string"
-
 desc "Setup test app"
 task :test_setup do
   solidus_version = ENV.fetch("SOLIDUS_VERSION", "4.2")
-  solidus_32_install_options =
-    "--payment-method none --frontend none --no-with-authentication"
-  solidus_33_install_options =
-    "--payment-method none --frontend none --authentication none"
-  solidus_install_options =
-    (
-      if solidus_version == "3.2"
-        solidus_32_install_options
-      else
-        solidus_33_install_options
-      end
-    )
+  solidus_install_options = "--payment-method none --frontend none --authentication none"
   Dir.chdir("spec/dummy") do
-    system <<-SETUP.strip_heredoc
+    system <<~SETUP
       bin/rake db:environment:set db:drop && \
       bin/rake gutentag:install:migrations && \
       bin/rails g gutentag:migration_versions && \