Merge pull request #1630 from voxpupuli/modulesync

modulesync 9.7.0

Author: TheMeier

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '9.4.0'
+modulesync_config_version: '9.7.0'

Gemfile

@@ -4,10 +4,8 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 9.0',   :require => false
-  gem 'coveralls',                  :require => false
-  gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 4.0',  :require => false
+  gem 'voxpupuli-test', '~> 10.0',  :require => false
+  gem 'puppet_metadata', '~> 5.0',  :require => false
 end
 
 group :development do
@@ -16,7 +14,7 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.5',  :require => false
 end
 
 group :release do

spec/defines/resource_geo_spec.rb

@@ -53,7 +53,7 @@
               title: 'should set address',
               attr: 'address',
               value: '$remote_addr',
-              match: 'geo $remote_addr $client_network {'
+              match: 'geo \$remote_addr \$client_network {'
             },
             {
               title: 'should set ranges',
@@ -109,7 +109,9 @@
               it { is_expected.to contain_file("/etc/nginx/conf.d/#{title}-geo.conf").with_mode('0644') }
 
               it param[:title] do
-                verify_contents(catalogue, "/etc/nginx/conf.d/#{title}-geo.conf", Array(param[:match]))
+                Array(param[:match]).each do |match_item|
+                  is_expected.to contain_file("/etc/nginx/conf.d/#{title}-geo.conf").with_content(Regexp.new(match_item))
+                end
                 Array(param[:notmatch]).each do |item|
                   is_expected.to contain_file("/etc/nginx/conf.d/#{title}-geo.conf").without_content(item)
                 end

spec/defines/resource_map_spec.rb

@@ -136,7 +136,9 @@
               it { is_expected.to contain_file("/etc/nginx/conf.d/#{title}-map.conf").with_mode('0644') }
 
               it param[:title] do
-                verify_contents(catalogue, "/etc/nginx/conf.d/#{title}-map.conf", Array(param[:match]))
+                Array(param[:match]).each do |match_item|
+                  is_expected.to contain_file("/etc/nginx/conf.d/#{title}-map.conf").with_content(Regexp.new(match_item))
+                end
                 Array(param[:notmatch]).each do |item|
                   is_expected.to contain_file("/etc/nginx/conf.d/#{title}-map.conf").without_content(item)
                 end