Support ruby 3

.github/workflows/ci.yaml

@@ -17,6 +17,7 @@ jobs:
       matrix:
         ruby-version:
         - '2.7'
+        - '3.0'
         test-suite:
         - vmdb
         - security

Gemfile

@@ -1,5 +1,5 @@
-raise "Ruby versions < 2.6.0 are unsupported!" if RUBY_VERSION < "2.6.0"
-raise "Ruby versions >= 3.0.0 are unsupported!" if RUBY_VERSION >= "3.0.0"
+raise "Ruby versions < 2.7.0 are unsupported!" if RUBY_VERSION < "2.7.0"
+raise "Ruby versions >= 3.1.0 are unsupported!" if RUBY_VERSION >= "3.1.0"
 
 source 'https://rubygems.org'
 
@@ -72,6 +72,7 @@ gem "ripper_ruby_parser",               "~>1.5.1",           :require => false
 gem "ruby-progressbar",                 "~>1.7.0",           :require => false
 gem "rubyzip",                          "~>2.0.0",           :require => false
 gem "rugged",                           "~>1.5.0",           :require => false
+gem "ruport",                           "~>1.8.0"
 gem "snmp",                             "~>1.2.0",           :require => false
 gem "sprockets",                        "~>3.7.2",           :require => false
 gem "sync",                             "~>0.5",             :require => false
@@ -85,7 +86,6 @@ gem "mime-types",                       "~>3.0",             :require => false,
 
 # Modified gems (forked on Github)
 gem "handsoap",                         "=0.2.5.5",          :require => false, :source => "https://rubygems.manageiq.org" # for manageiq-gems-pending only
-gem "ruport",                           "=1.7.0.3",                             :source => "https://rubygems.manageiq.org"
 
 # In 1.9.3: Time.parse uses british version dd/mm/yyyy instead of american version mm/dd/yyyy
 # american_date fixes this to be compatible with 1.8.7 until all callers can be converted to the 1.9.3 format prior to parsing.
@@ -257,7 +257,7 @@ group :ui_dependencies do # Added to Bundler.require in config/application.rb
   manageiq_plugin "manageiq-decorators"
   manageiq_plugin "manageiq-ui-classic"
   # Modified gems (forked on Github)
-  gem "jquery-rjs",                     "=0.1.1.2",          :source => "https://rubygems.manageiq.org"
+  gem "jquery-rjs",                     "=0.1.1.3",          :source => "https://rubygems.manageiq.org"
 end
 
 group :web_server, :manageiq_default do

spec/lib/acts_as_ar_model_spec.rb

@@ -61,7 +61,7 @@
     end
 
     it "supports where (as an example)" do
-      expect(base_class).to receive(:find).with(:all, :conditions => {:id => 5}).and_return([])
+      expect(base_class).to receive(:find).with(:all, {:conditions => {:id => 5}}).and_return([])
       expect(base_class.all.where(:id => 5).to_a).to eq([])
     end
   end

spec/lib/rbac/filterer_spec.rb

@@ -652,7 +652,7 @@ def combine_filtered_ids(user_filtered_ids, belongsto_filtered_ids, managed_filt
         end
 
         it "includes references" do
-          expect(subject).to receive(:include_references).with(anything, ::Vm, nil, :host => {})
+          expect(subject).to receive(:include_references).with(anything, ::Vm, nil, {:host => {}})
                                                          .and_call_original
           expect(subject).to receive(:warn).never
           results
@@ -2482,7 +2482,7 @@ def get_rbac_results_for_and_expect_objects(klass, expected_objects)
     end
 
     it "support aaarm object" do
-      expect(VimPerformanceTrend).to receive(:find).with(:all, :include => {:a => {}}).and_return([:good])
+      expect(VimPerformanceTrend).to receive(:find).with(:all, {:include => {:a => {}}}).and_return([:good])
       expect(described_class.filtered(VimPerformanceTrend, :include_for_find => {:a => {}}).to_a).to match_array([:good])
     end
 

spec/models/authenticator/database_spec.rb

@@ -39,16 +39,16 @@ def authenticate
       end
 
       it "records two successful audit entries" do
-        expect(AuditEvent).to receive(:success).with(
-          :event   => 'authenticate_database',
-          :userid  => 'alice',
-          :message => "User alice successfully validated by EVM",
-        )
-        expect(AuditEvent).to receive(:success).with(
-          :event   => 'authenticate_database',
-          :userid  => 'alice',
-          :message => "Authentication successful for user alice",
-        )
+        expect(AuditEvent).to receive(:success).with({
+                                                       :event   => 'authenticate_database',
+                                                       :userid  => 'alice',
+                                                       :message => "User alice successfully validated by EVM",
+                                                     })
+        expect(AuditEvent).to receive(:success).with({
+                                                       :event   => 'authenticate_database',
+                                                       :userid  => 'alice',
+                                                       :message => "Authentication successful for user alice",
+                                                     })
         expect(AuditEvent).not_to receive(:failure)
         authenticate
       end
@@ -92,11 +92,11 @@ def authenticate
       end
 
       it "records one failing audit entry" do
-        expect(AuditEvent).to receive(:failure).with(
-          :event   => 'authenticate_database',
-          :userid  => 'alice',
-          :message => "Authentication failed for userid alice",
-        )
+        expect(AuditEvent).to receive(:failure).with({
+                                                       :event   => 'authenticate_database',
+                                                       :userid  => 'alice',
+                                                       :message => "Authentication failed for userid alice",
+                                                     })
         expect(AuditEvent).not_to receive(:success)
         authenticate rescue nil
       end
@@ -122,11 +122,11 @@ def authenticate
       end
 
       it "records one failing audit entry" do
-        expect(AuditEvent).to receive(:failure).with(
-          :event   => 'authenticate_database',
-          :userid  => 'bob',
-          :message => "Authentication failed for userid bob",
-        )
+        expect(AuditEvent).to receive(:failure).with({
+                                                       :event   => 'authenticate_database',
+                                                       :userid  => 'bob',
+                                                       :message => "Authentication failed for userid bob",
+                                                     })
         expect(AuditEvent).not_to receive(:success)
         authenticate rescue nil
       end
@@ -146,16 +146,16 @@ def authenticate
       end
 
       it "records two successful audit entries" do
-        expect(AuditEvent).to receive(:success).with(
-          :event   => 'authenticate_database',
-          :userid  => 'vincent',
-          :message => "User vincent successfully validated by EVM",
-        )
-        expect(AuditEvent).to receive(:success).with(
-          :event   => 'authenticate_database',
-          :userid  => 'vincent',
-          :message => "Authentication successful for user vincent",
-        )
+        expect(AuditEvent).to receive(:success).with({
+                                                       :event   => 'authenticate_database',
+                                                       :userid  => 'vincent',
+                                                       :message => "User vincent successfully validated by EVM",
+                                                     })
+        expect(AuditEvent).to receive(:success).with({
+                                                       :event   => 'authenticate_database',
+                                                       :userid  => 'vincent',
+                                                       :message => "Authentication successful for user vincent",
+                                                     })
         expect(AuditEvent).not_to receive(:failure)
         authenticate
       end