From 5e2d55fc5903843f4cbeecb96df275f3cadb0695 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 17 Aug 2023 15:20:24 +0200
Subject: [PATCH 1/2] modulesync 7.0.0

---
 .github/CONTRIBUTING.md | 11 +++++++----
 .msync.yml              |  2 +-
 Gemfile                 |  2 +-
 spec/spec_helper.rb     |  1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8b466cf..6aaa603 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian11-64 bundle exec rake beaker
+BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
-You can replace the string `debian10` with any common operating system.
+You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1804
 * ubuntu2004
-* debian10
+* ubuntu2204
 * debian11
 * centos7
 * centos8
+* centos9
+* almalinux8
+* almalinux9
+* fedora36
 
 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
 
diff --git a/.msync.yml b/.msync.yml
index b929160..dd3e957 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '6.0.0'
+modulesync_config_version: '7.0.0'
diff --git a/Gemfile b/Gemfile
index 5879eb4..f78ace0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 6.0',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
   gem 'puppet_metadata', '~> 3.0',  :require => false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0c667ff..d1dc0d6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -19,3 +19,4 @@
 end
 
 require 'spec_helper_local'
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }

From d8d80c96ba0af0794e35320adf145f42ac0fec3e Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 18 Aug 2023 00:17:08 +0200
Subject: [PATCH 2/2] rubocop: autofix

---
 .rubocop_todo.yml                     | 17 ++++++++++++++---
 spec/classes/gitlab_ci_runner_spec.rb |  2 +-
 spec/defines/runner_spec.rb           |  3 +--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 45c556d..b60d131 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,19 +1,30 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-12-14 08:02:15 UTC using RuboCop version 1.22.3.
+# on 2023-08-17 21:32:43 UTC using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/functions/register_spec.rb'
+    - 'spec/functions/register_to_file_spec.rb'
+    - 'spec/functions/to_toml_spec.rb'
+    - 'spec/functions/unregister_from_file_spec.rb'
+    - 'spec/functions/unregister_spec.rb'
+
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: MinBranchesCount.
 Style/CaseLikeIf:
   Exclude:
     - 'lib/puppet_x/gitlab/dumper.rb'
 
 # Offense count: 3
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
diff --git a/spec/classes/gitlab_ci_runner_spec.rb b/spec/classes/gitlab_ci_runner_spec.rb
index 4242abc..22679cd 100644
--- a/spec/classes/gitlab_ci_runner_spec.rb
+++ b/spec/classes/gitlab_ci_runner_spec.rb
@@ -383,7 +383,7 @@
             is_expected.to contain_yumrepo('runner_gitlab-runner').
               with(
                 ensure: 'present',
-                baseurl: "https://packages.gitlab.com/runner/gitlab-runner/el/#{os_release_version}/\$basearch",
+                baseurl: "https://packages.gitlab.com/runner/gitlab-runner/el/#{os_release_version}/$basearch",
                 descr: 'runner_gitlab-runner',
                 enabled: '1',
                 gpgcheck: '0',
diff --git a/spec/defines/runner_spec.rb b/spec/defines/runner_spec.rb
index 2a57ddb..1f07ef1 100644
--- a/spec/defines/runner_spec.rb
+++ b/spec/defines/runner_spec.rb
@@ -125,8 +125,7 @@
       context 'with name not included in config' do
         let(:params) do
           {
-            config: {
-            }
+            config: {}
           }
         end