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/classes/telegraf_spec.rb b/spec/classes/telegraf_spec.rb index 950bb31..6457184 100644 --- a/spec/classes/telegraf_spec.rb +++ b/spec/classes/telegraf_spec.rb @@ -181,7 +181,7 @@ } it { - is_expected.to contain_file("#{config_dir}/telegraf.d/rename_processor.conf").\ + is_expected.to contain_file("#{config_dir}/telegraf.d/rename_processor.conf"). \ with_content(<<~STRING [[processors.rename]] namepass = ["diskio"] @@ -222,7 +222,7 @@ it { is_expected.to contain_yumrepo('influxdata'). with( - baseurl: "https://repos.influxdata.com/rhel/\$releasever/\$basearch/stable" + baseurl: 'https://repos.influxdata.com/rhel/$releasever/$basearch/stable' ) } end @@ -241,7 +241,7 @@ it { is_expected.to contain_yumrepo('influxdata'). with( - baseurl: "https://repos.influxdata.com/rhel/\$releasever/\$basearch/unstable" + baseurl: 'https://repos.influxdata.com/rhel/$releasever/$basearch/unstable' ) } end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f5a4b88..acca33e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -21,3 +21,4 @@ add_custom_fact name.to_sym, value end end +Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }