From 51970efd5d290810ddee32ae165877c54fbba540 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 13 Oct 2018 17:18:09 +0200
Subject: [PATCH 1/2] modulesync 2.2.0

---
 .msync.yml             |  2 +-
 Gemfile                |  2 +-
 spec/default_facts.yml |  1 -
 spec/spec_helper.rb    | 19 +++++++++----------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.msync.yml b/.msync.yml
index e1f48cab..1d2221fa 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.1.0'
+modulesync_config_version: '2.2.0'
diff --git a/Gemfile b/Gemfile
index dd1b03a6..7ed69d4e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ end
 
 group :test do
   gem 'puppetlabs_spec_helper', '>= 2.11.0',                        :require => false
-  gem 'rspec-puppet-facts',                                         :require => false
+  gem 'rspec-puppet-facts', '>= 1.8.0',                             :require => false
   gem 'rspec-puppet-utils',                                         :require => false
   gem 'puppet-lint-leading_zero-check',                             :require => false
   gem 'puppet-lint-trailing_comma-check',                           :require => false
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index 13c41657..2f6698d5 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -8,7 +8,6 @@
 # Hint if using with rspec-puppet-facts ("on_supported_os.each"):
 #   if a same named fact exists in facterdb it will be overridden.
 ---
-concat_basedir: "/tmp"
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ea74a52a..88bca595 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,10 +1,9 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-include RspecPuppetFacts
-
 # This file is managed via modulesync
 # https://github.com/voxpupuli/modulesync
 # https://github.com/voxpupuli/modulesync_config
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet-facts'
+include RspecPuppetFacts
 
 if Dir.exist?(File.expand_path('../../lib', __FILE__))
   require 'coveralls'
@@ -23,13 +22,13 @@
 end
 
 RSpec.configure do |c|
-  default_facts = {
-    puppetversion: Puppet.version,
-    facterversion: Facter.version
-  }
+  default_facts = {}
   default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
   default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
   c.default_facts = default_facts
-end
 
-# vim: syntax=ruby
+  # Coverage generation
+  c.after(:suite) do
+    RSpec::Puppet::Coverage.report!
+  end
+end

From d4ae7036fe3fe6641250e82d88b953b7d5ece595 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 13 Oct 2018 17:18:29 +0200
Subject: [PATCH 2/2] delete unneeded coverage_spec.rb

---
 spec/classes/coverage_spec.rb | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 spec/classes/coverage_spec.rb

diff --git a/spec/classes/coverage_spec.rb b/spec/classes/coverage_spec.rb
deleted file mode 100644
index de446548..00000000
--- a/spec/classes/coverage_spec.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'rspec-puppet'
-
-at_exit { RSpec::Puppet::Coverage.report! }
-# vim: syntax=ruby