[22953] Fix running tests

Author: ngiger

.github/workflows/ruby.yml

@@ -44,7 +44,7 @@ jobs:
         run: ./redmine update
 
       - name: run prepare tests
-        run: bundle exec rake db:test:prepare
+        run: ./redmine exec bundle exec rake db:test:prepare
 
       - name: run plugins tests
-        run: bundle exec rake  redmine:plugins:test
+        run: ./redmine exec bundle exec rake redmine:plugins:test

db/migrate/001_create_access_filters.rb

@@ -1,4 +1,4 @@
-class CreateAccessFilters < ActiveRecord::Migration
+class CreateAccessFilters < ActiveRecord::Migration[5.2]
   def change
     create_table :access_filters do |t|
       t.references :user
@@ -7,4 +7,4 @@ def change
       t.text	:cidrs
     end
   end
-end
+end

db/migrate/002_add_active_flag_to_access_filters.rb

@@ -1,5 +1,5 @@
-class AddActiveFlagToAccessFilters < ActiveRecord::Migration
+class AddActiveFlagToAccessFilters < ActiveRecord::Migration[5.2]
   def change
     add_column :access_filters, :active, :boolean, :default => true
   end
-end
+end

db/migrate/003_add_position_to_access_filters.rb

@@ -1,5 +1,5 @@
-class AddPositionToAccessFilters < ActiveRecord::Migration
+class AddPositionToAccessFilters < ActiveRecord::Migration[5.2]
   def change
     add_column :access_filters, :position, :integer, :default => 0
   end
-end
+end

db/migrate/004_add_polymorphism_to_access_filters.rb

@@ -1,7 +1,7 @@
-class AddPolymorphismToAccessFilters < ActiveRecord::Migration
+class AddPolymorphismToAccessFilters < ActiveRecord::Migration[5.2]
   def change
     add_column :access_filters, :owner_type, :string
     add_column :access_filters, :owner_id, :integer
     remove_column :access_filters, :user_id
   end
-end
+end

scripts/install

@@ -56,6 +56,7 @@ group :test do
 end
 EOF
 
+(set -x; bundle config set --local without 'rmagick' ${BUNDLE_OPTS})
 (set -x; bundle install --without rmagick --jobs=3 --retry=3 ${BUNDLE_OPTS})
 (set -x; bundle exec rake generate_secret_token db:create:all db:migrate redmine:plugins:migrate db:test:prepare)
 

test/functional/access_filter_test.rb

@@ -17,13 +17,10 @@ def setup
     AccessFilter.destroy_all
 
     @controller = IssuesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @request.session[:user_id] = 1
     @request.env['REMOTE_ADDR'] = '192.168.0.1'    
     @group = Group.create(:name => 'Test group')
     @group.users << User.find(1)
-
   end
 
   def test_works_if_no_rules_exist
@@ -45,7 +42,7 @@ def test_prevents_http_access_if_specified
   def test_prevents_api_access_if_specified
     AccessFilter.create(:owner_id => "User|1", :web => false, :api => true, :cidrs => 'any')
     with_settings :rest_api_enabled => '1' do
-      get :index, :format => :json, :key => User.find(1).api_key
+      get :index, :params => { :format => :json, :key => User.find(1).api_key}
     end
     assert_response 403
   end
@@ -77,7 +74,7 @@ def test_does_not_allow_http_access_if_ip_mismatched_for_subnet
   def test_allows_api_access_if_ip_matched
     AccessFilter.create(:owner_id => "User|1", :web => false, :api => false, :cidrs => '192.168.0.1')
     with_settings :rest_api_enabled => '1' do
-      get :index, :format => :json, :key => User.find(1).api_key
+      get :index, :params => {:format => :json, :key => User.find(1).api_key}
     end
 
     assert_response :success
@@ -86,7 +83,7 @@ def test_allows_api_access_if_ip_matched
   def test_allows_api_access_if_ip_matched_for_subnet
     AccessFilter.create(:owner_id => "User|1", :web => false, :api => false, :cidrs => '192.168.0.0/24')
     with_settings :rest_api_enabled => '1' do
-      get :index, :format => :json, :key => User.find(1).api_key
+      get :index, :params => {:format => :json, :key => User.find(1).api_key}
     end
 
     assert_response :success
@@ -95,7 +92,7 @@ def test_allows_api_access_if_ip_matched_for_subnet
   def test_does_not_allow_api_access_if_ip_mismatched_for_subnet
     AccessFilter.create(:owner_id => "User|1", :web => false, :api => false, :cidrs => '192.168.1.0/24')
     with_settings :rest_api_enabled => '1' do
-      get :index, :format => :json, :key => User.find(1).api_key
+      get :index, :params => {:format => :json, :key => User.find(1).api_key}
     end
     assert_response 403
   end
@@ -132,4 +129,4 @@ def test_access_filter_with_empty_cidrs_field_treated_as_any
     assert_response 200    
   end
 
-end
+end