Use safe load to test with ruby 3.1/newer psych

ManageIQ · Jan 12, 2024 · b3f5f86 · b3f5f86
1 parent 1a6f6b3
commit b3f5f86
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Rakefile b/Rakefile
@@ -20,7 +20,13 @@ namespace :spec do
 
   def connection_spec
     require 'yaml'
-    @connection_spec ||= YAML.load_file(File.join(__dir__, %w[config database.yml]))
+    @connection_spec ||= begin
+      if YAML.respond_to?(:safe_load)
+        YAML.safe_load(File.read(File.join(__dir__, %w[config database.yml])), :aliases => true)
+      else
+        YAML.load_file(File.join(__dir__, %w[config database.yml]))
+      end
+    end
   end
 
   def test_database_name

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -28,5 +28,9 @@
 puts "\e[93mUsing ActiveRecord #{ActiveRecord.version}\e[0m"
 
 require 'yaml'
-connection_spec = YAML.load_file(File.join(__dir__, %w[.. config database.yml]))
+if YAML.respond_to?(:safe_load)
+  YAML.safe_load(File.read(File.join(__dir__, %w[.. config database.yml])), :aliases => true)
+else
+  YAML.load_file(File.join(__dir__, %w[.. config database.yml]))
+end
 ActiveRecord::Base.establish_connection(connection_spec["test"])