From f88a308f4166e46f43721d9cee5d2ed8d77abd18 Mon Sep 17 00:00:00 2001
From: Kenyon Ralph <kenyon@kenyonralph.com>
Date: Sat, 26 Aug 2023 08:22:18 -0700
Subject: [PATCH 1/3] metadata.json: drop EoL Ubuntu 18.04

---
 metadata.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index a83761c38..af73891b7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -95,7 +95,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
         "20.04",
         "22.04"
       ]

From 38f0354a8b526d57f7df31e1530d8ff3af69807a Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 17 Aug 2023 16:40:35 +0200
Subject: [PATCH 2/3] modulesync 7.0.0

---
 .msync.yml          | 2 +-
 Gemfile             | 2 +-
 spec/spec_helper.rb | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.msync.yml b/.msync.yml
index b929160c9..dd3e95722 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 98a04cfb9..db21d3b56 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 6515b7bf7..9efb4ae62 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 }

From e96f3ce1a77b4f777885692a383924b3822dbc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 17 Aug 2023 16:01:21 -1000
Subject: [PATCH 3/3] Auto-correct rubocop offenses

---
 spec/unit/facter/util/fact_nginx_version_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/unit/facter/util/fact_nginx_version_spec.rb b/spec/unit/facter/util/fact_nginx_version_spec.rb
index 94cff3635..70bea5dee 100644
--- a/spec/unit/facter/util/fact_nginx_version_spec.rb
+++ b/spec/unit/facter/util/fact_nginx_version_spec.rb
@@ -11,7 +11,7 @@
       allow(Facter::Util::Resolution).to receive(:which).with('openresty').and_return(false)
     end
 
-    it { expect(Facter.fact(:nginx_version).value).to eq(nil) }
+    it { expect(Facter.fact(:nginx_version).value).to be_nil }
   end
 
   context 'nginx' do