Merge pull request #95 from AlchemyCMS/alchemy-7.4

Test Alchemy 7.4

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   RSpec:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -17,10 +17,21 @@ jobs:
           - 7.1-stable
           - 7.2-stable
           - 7.3-stable
+          - 7.4-stable
         ruby:
           - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
+        exclude:
+          - alchemy_branch: 7.0-stable
+            ruby: "3.4"
+          - alchemy_branch: 7.1-stable
+            ruby: "3.4"
+          - alchemy_branch: 7.2-stable
+            ruby: "3.4"
+          - alchemy_branch: 7.3-stable
+            ruby: "3.4"
     env:
       ALCHEMY_BRANCH: ${{ matrix.alchemy_branch }}
     steps:
@@ -47,10 +58,9 @@ jobs:
           RAILS_ENV: test
           DB_USER: user
           DB_PASSWORD: password
-          DB_PORT: ${{ job.services.mariadb.ports[3306] }}
         run: bundle exec rake
   Jest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       NODE_ENV: test
     steps:

Gemfile

@@ -17,7 +17,7 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 gem "sqlite3", "~> 2.2"
 
-alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "7.3-stable")
+alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "7.4-stable")
 gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: alchemy_branch
 gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
 

spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,6 @@
 # frozen_string_literal: true
 class ApplicationController < ActionController::Base
+  # Necessary for authorize_user stub in controller specs
+  def current_user
+  end
 end