From f8faa812549dcdfd64ceacae647039acb5d8e7a3 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 11 Feb 2020 19:32:27 +0100
Subject: modulesync 3.0.0

---
 spec/spec_helper.rb | 52 ++++++----------------------------------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

(limited to 'spec')

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 93f417a..d1ca54c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,20 +1,15 @@
 # This file is managed via modulesync
 # https://github.com/voxpupuli/modulesync
 # https://github.com/voxpupuli/modulesync_config
-RSpec.configure do |c|
-  c.mock_with :rspec
-end
-
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-require 'bundler'
-include RspecPuppetFacts
 
-if ENV['DEBUG']
-  Puppet::Util::Log.level = :debug
-  Puppet::Util::Log.newdestination(:console)
+# puppetlabs_spec_helper will set up coverage if the env variable is set.
+# We want to do this if lib exists and it hasn't been explicitly set.
+if Dir.exist?(File.expand_path('../../lib', __FILE__))
+  ENV['COVERAGE'] ||= 'yes'
 end
 
+require 'voxpupuli/test/spec_helper'
+
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
   facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
   if facts
@@ -24,38 +19,3 @@ if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
   end
 end
 
-if Dir.exist?(File.expand_path('../../lib', __FILE__))
-  require 'coveralls'
-  require 'simplecov'
-  require 'simplecov-console'
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::Console
-  ]
-  SimpleCov.start do
-    track_files 'lib/**/*.rb'
-    add_filter '/spec'
-    add_filter '/vendor'
-    add_filter '/.vendor'
-    add_filter Bundler.configured_bundle_path.path
-  end
-end
-
-RSpec.configure do |c|
-  # getting the correct facter version is tricky. We use facterdb as a source to mock facts
-  # see https://github.com/camptocamp/facterdb
-  # people might provide a specific facter version. In that case we use it.
-  # Otherwise we need to match the correct facter version to the used puppet version.
-  # as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
-  # https://puppet.com/docs/puppet/5.5/about_agent.html
-  c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
-                               ENV['FACTERDB_FACTS_VERSION']
-                             else
-                               Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
-                             end
-
-  # Coverage generation
-  c.after(:suite) do
-    RSpec::Puppet::Coverage.report!
-  end
-end
-- 
cgit v1.2.3


From be298bed6169c9f59148042af47e12faffe48881 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 11 Feb 2020 21:18:19 +0100
Subject: cleanup spec_helper.rb

---
 spec/spec_helper.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'spec')

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d1ca54c..b2b2704 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,9 +4,7 @@
 
 # puppetlabs_spec_helper will set up coverage if the env variable is set.
 # We want to do this if lib exists and it hasn't been explicitly set.
-if Dir.exist?(File.expand_path('../../lib', __FILE__))
-  ENV['COVERAGE'] ||= 'yes'
-end
+ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../../lib', __FILE__))
 
 require 'voxpupuli/test/spec_helper'
 
@@ -18,4 +16,3 @@ if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
     end
   end
 end
-
-- 
cgit v1.2.3