Support ruby 3.1 by using a compatible way to YAML.load with aliases

ManageIQ · Jan 18, 2024 · e643c4d · e643c4d
1 parent e0a10cc
commit e643c4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,6 +14,7 @@ jobs:
         ruby-version:
         - '2.7'
         - '3.0'
+        - '3.1'
         rails-version:
         - '6.0'
         - '6.1'

diff --git a/spec/config_handler/rails_config_handler_spec.rb b/spec/config_handler/rails_config_handler_spec.rb
@@ -5,7 +5,7 @@
 
   before do
     @yml_file = Tempfile.new('database.yml')
-    yml_data = YAML.load(<<-DOC)
+    data = <<-DOC
 ---
 base: &base
   username: user
@@ -16,6 +16,12 @@
   pool: 3
   database: vmdb_test
 DOC
+    yml_data =
+      if YAML.respond_to?(:safe_load)
+        YAML.safe_load(data, :aliases => true)
+      else
+        YAML.load(data)
+      end
     File.write(@yml_file.path, yml_data.to_yaml)
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ jobs: @@
             ruby-version:
             - '2.7'
             - '3.0'
+            - '3.1'
             rails-version:
             - '6.0'
             - '6.1'
@@ Expand Down @@