From a4f0430465093289b96f5dbb48523e5b7378b9a0 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 12 Sep 2017 14:45:42 +0100
Subject: [PATCH] Cleanup mock setup

---
 spec/spec_helper.rb                           |  3 ++
 spec/spec_helper_new.rb                       | 41 -------------------
 .../puppet/provider/apt_key2/apt_key2_spec.rb |  2 +-
 3 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 spec/spec_helper_new.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8c046d0..6ae38e4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -36,3 +36,6 @@ begin
 rescue LoadError
 end
 
+RSpec.configure do |c|
+  c.mock_with :rspec
+end
\ No newline at end of file
diff --git a/spec/spec_helper_new.rb b/spec/spec_helper_new.rb
deleted file mode 100644
index 6ae38e4..0000000
--- a/spec/spec_helper_new.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-if ENV['COVERAGE'] == 'yes'
-  require 'coveralls'
-  require 'simplecov'
-  require 'simplecov-console'
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::HTMLFormatter,
-    # SimpleCov::Formatter::Console,
-    Coveralls::SimpleCov::Formatter,
-  ]
-  SimpleCov.start do
-    track_files 'lib/**/*.rb'
-
-    add_filter '/spec'
-
-    # do not track vendored files
-    add_filter '/vendor'
-    add_filter '/.vendor'
-
-    # do not track gitignored files
-    # this adds about 4 seconds to the coverage check
-    # this could definitely be optimized
-    add_filter do |f|
-      # system returns true if exit status is 0, which with git-check-ignore means file is ignored
-      system("git check-ignore --quiet #{f.filename}")
-    end
-  end
-end
-
-#This file is generated by ModuleSync, do not edit.
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-# put local configuration and setup into spec_helper_local
-begin
-  require 'spec_helper_local'
-rescue LoadError
-end
-
-RSpec.configure do |c|
-  c.mock_with :rspec
-end
\ No newline at end of file
diff --git a/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb b/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb
index 9400de7..5175bd0 100644
--- a/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb
+++ b/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper_new'
+require 'spec_helper'
 
 # TODO: needs some cleanup/helper to avoid this misery
 module Puppet::Provider::AptKey2; end
-- 
2.45.2