Merge pull request #192 from tvdeyen/alchemy-7.1

Add Alchemy 7.1 support

.github/workflows/ci.yml

@@ -9,11 +9,13 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - main
+          - "7.0-stable"
+          - "main"
         ruby:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
         database:
           - mysql
           - postgresql
@@ -71,18 +73,6 @@ jobs:
           sudo apt update -qq
           sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
-      - name: Restore node modules cache
-        id: yarn-cache
-        uses: actions/cache@v3
-        with:
-          path: spec/dummy/node_modules
-          key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-dummy-
-      - name: Set up Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
       - name: Prepare database
         run: bundle exec rake alchemy:spec:prepare
       - name: Run tests & publish code coverage

alchemy-devise.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"]
 
-  s.add_dependency "alchemy_cms", [">= 7.0.0-rc1", "< 8"]
+  s.add_dependency "alchemy_cms", [">= 7.0.0", "< 8"]
   s.add_dependency "devise", [">= 4.7.1", "< 5"]
 
   s.add_development_dependency "capybara"

app/views/alchemy/admin/users/_fields.html.erb

@@ -11,7 +11,11 @@
 <% if can_update_role? %>
   <%= f.input :alchemy_roles,
     collection: @user_roles,
-    input_html: {multiple: true, class: 'alchemy_selectbox'},
+    input_html: {
+      multiple: true,
+      is: 'alchemy-select',
+      class: 'alchemy_selectbox'
+    },
     as: 'select' %>
 <% end %>
 <% unless while_signup? %>

config/initializers/alchemy.rb

@@ -13,7 +13,7 @@
       name: "modules.users",
       controller: "/alchemy/admin/users",
       action: "index",
-      icon: "users"
+      icon: (Alchemy.gem_version > Gem::Version.new("7.0")) ? "group-line" : "users"
     }
   })
 

spec/rails_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./spec_helper"
+require_relative "spec_helper"
 
 # Configure Rails Environment
 ENV["RAILS_ENV"] ||= "test"