Update CI config: add Redmine 6 and drop support of Redmine 4

Author: nanego

.github/workflows/5_1_2.yml renamed to .github/workflows/5_1_5.yml

@@ -1,8 +1,8 @@
-name: Tests 5.1.2
+name: Tests 5.1.5
 
 env:
   PLUGIN_NAME: redmine_extended_workflows
-  REDMINE_VERSION: 5.1.2
+  REDMINE_VERSION: 5.1.5
   RAILS_ENV: test
 
 on:

.github/workflows/4_2_11.yml renamed to .github/workflows/6_0_2.yml

@@ -1,8 +1,8 @@
-name: Tests 4.2.11
+name: Tests 6.0.2
 
 env:
   PLUGIN_NAME: redmine_extended_workflows
-  REDMINE_VERSION: 4.2.11
+  REDMINE_VERSION: 6.0.2
   RAILS_ENV: test
 
 on:
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7']
+        ruby: ['3.3']
         db: ['postgres']
       fail-fast: false
 
@@ -89,8 +89,6 @@ jobs:
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
-          # TODO Remove the following line when https://www.redmine.org/issues/40551 is fixed
-          sed -i -e 's/.*mocha.*/  gem "mocha", "2.1.0"/' Gemfile # Fix core tests not compatible with Mocha 2.2.0
           sed -i '/rubocop/d' Gemfile
           rm -f .rubocop*
           cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml

.github/workflows/master.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['3.2']
+        ruby: ['3.3']
         db: ['postgres']
       fail-fast: false
 

README.md

@@ -24,12 +24,12 @@ Test status
 
 | Plugin branch | Redmine Version | Test Status       |
 |---------------|-----------------|-------------------|
-| master        | 5.1.2           | [![5.1.2][1]][5]  |
-| master        | 4.2.11          | [![4.2.11][2]][5] |
+| master        | 5.1.5           | [![5.1.5][1]][5]  |
+| master        | 6.0.2           | [![6.0.2][2]][5]  |
 | master        | master          | [![master][4]][5] |
 
-[1]: https://github.com/nanego/redmine_extended_workflows/actions/workflows/5_1_2.yml/badge.svg
-[2]: https://github.com/nanego/redmine_extended_workflows/actions/workflows/4_2_11.yml/badge.svg
+[1]: https://github.com/nanego/redmine_extended_workflows/actions/workflows/5_1_5.yml/badge.svg
+[2]: https://github.com/nanego/redmine_extended_workflows/actions/workflows/6_0_2.yml/badge.svg
 [4]: https://github.com/nanego/redmine_extended_workflows/actions/workflows/master.yml/badge.svg
 [5]: https://github.com/nanego/redmine_extended_workflows/actions
 

app/models/workflow_project.rb

@@ -1,4 +1,4 @@
-class WorkflowProject < ActiveRecord::Base
+class WorkflowProject < ApplicationRecord
 
   belongs_to :role
   validates_presence_of :role

assets/javascripts/redmine_extended_workflows.js

@@ -2,4 +2,4 @@ function selectOptionForAll(parent_selector, element_selector, option) {
   $(parent_selector).find(`select[name^=${element_selector}]`).each(function() {
     $(this).val(option);
   })
-}
+}

init.rb

@@ -8,3 +8,10 @@
   url 'https://github.com/nanego/redmine_extended_workflows'
   requires_redmine_plugin :redmine_base_rspec, :version_or_higher => '0.0.3' if Rails.env.test?
 end
+
+# Support for Redmine 5
+if Redmine::VERSION::MAJOR < 6
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

lib/redmine_extended_workflows/models/project_patch.rb

@@ -31,6 +31,6 @@ def self.get_read_only_attribute_for_roles(user_roles)
 end
 Project.send(:include, RedmineExtendedWorkflows::Models::ProjectPatch)
 
-class Project < ActiveRecord::Base
+class Project
   CORE_FIELDS = %w(name description is_public parent_id inherit_members homepage).freeze
 end

spec/controllers/projects_controller_spec.rb

@@ -9,10 +9,8 @@
   include Redmine::I18n
 
   before do
-    @controller = ProjectsController.new
-    @request = ActionDispatch::TestRequest.create
-    @response = ActionDispatch::TestResponse.new
     User.current = nil
+    @request.session = ActionController::TestSession.new
     @request.session[:user_id] = 2 # permissions are hard
   end
 

spec/controllers/workflows_controller_spec.rb

@@ -13,6 +13,7 @@
     @response = ActionDispatch::TestResponse.new
     Setting.default_language = 'en'
     User.current = nil
+    @request.session = ActionController::TestSession.new
     @request.session[:user_id] = 1 # permissions admin
   end