Merge pull request #1240 from github/test-fixes

update ruby version in tests to match gh pages version

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.4
+        ruby-version: 3.3.4
         bundler-cache: true
 
     - name: Run tests

.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.3
   Exclude:
     - _site/**/*
     - vendor/**/*

script/check-approval

@@ -58,7 +58,7 @@ rows << :separator
 eligible = !current && spdx && approved_licenses.include?(license)
 rows << ['Eligible', eligible]
 
-puts Terminal::Table.new title: "License: #{license}", rows: rows
+puts Terminal::Table.new title: "License: #{license}", rows:
 puts
 puts "Code search: https://github.com/search?q=#{license}+filename%3ALICENSE&type=Code"
 

spec/spec_helper.rb

@@ -27,7 +27,7 @@ end
 def config
   SpecHelper.config ||= begin
     config = Jekyll::Configuration.new.read_config_file config_file
-    config = Jekyll::Utils.deep_merge_hashes(config, source: source)
+    config = Jekyll::Utils.deep_merge_hashes(config, source:)
     Jekyll::Utils.deep_merge_hashes(Jekyll::Configuration::DEFAULTS, config)
   end
 end