From 56d7bce5f90ca3c45e1f227cb7b7afda1ee3f5b2 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 17 Aug 2023 16:58:31 +0200
Subject: [PATCH 1/2] modulesync 7.0.0

---
 .github/CONTRIBUTING.md        | 11 +++++++----
 .msync.yml                     |  2 +-
 Gemfile                        |  2 +-
 spec/spec_helper.rb            |  1 +
 spec/spec_helper_acceptance.rb |  2 +-
 5 files changed, 11 insertions(+), 7 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 98a04cf..db21d3b 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 6515b7b..9efb4ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index d3a6e23..2681792 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -5,6 +5,6 @@
 
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-configure_beaker
+configure_beaker(modules: :metadata)
 
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }

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

---
 lib/puppet/type/posix_acl.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/puppet/type/posix_acl.rb b/lib/puppet/type/posix_acl.rb
index 2b63564..db13114 100644
--- a/lib/puppet/type/posix_acl.rb
+++ b/lib/puppet/type/posix_acl.rb
@@ -277,7 +277,7 @@ def generate
     if File.directory?(self[:path])
       Dir.chdir(self[:path]) do
         Dir['**/*'].each do |path|
-          paths << ::File.join(self[:path], path)
+          paths << File.join(self[:path], path)
         end
       end
     end