Merge branch '1.6.x'

Author: DavidS

.travis.yml

@@ -14,8 +14,8 @@ branches:
 matrix:
   include:
     - rvm: 2.4.3
-      env: PUPPET_GEM_VERSION='~> 5' COVERAGE=yes # 5.5
-    - env: RVM="jruby-1.7.26" PUPPET_GEM_VERSION='~> 5' JRUBY_OPTS="--debug" COVERAGE=yes
+      env: PUPPET_GEM_VERSION='~> 5' SIMPLECOV=yes # 5.5
+    - env: RVM="jruby-1.7.26" PUPPET_GEM_VERSION='~> 5' JRUBY_OPTS="--debug" SIMPLECOV=yes
       before_cache: pushd ~/.rvm && rm -rf archives rubies/ruby-2.2.7 rubies/ruby-2.3.4 && popd
       cache:
         bundler: true
@@ -45,7 +45,7 @@ matrix:
     - rvm: 2.4.1
       env: PUPPET_GEM_VERSION='~> 5.0.0'
     - rvm: 2.1.9
-      env: PUPPET_GEM_VERSION='~> 4'  COVERAGE=yes # 4.10
+      env: PUPPET_GEM_VERSION='~> 4'  SIMPLECOV=yes # 4.10
       before_install:
         - gem install bundler -v '< 2'
     - rvm: 2.1.9

Rakefile

@@ -27,7 +27,7 @@ end
 namespace :spec do
   desc 'Run RSpec code examples with coverage collection'
   task :coverage do
-    ENV['COVERAGE'] = 'yes'
+    ENV['SIMPLECOV'] = 'yes'
     Rake::Task['spec'].execute
   end
 end

spec/puppet/resource_api_spec.rb

@@ -1763,7 +1763,7 @@ def set(_context, _changes, noop: false); end
   context 'with a `simple_get_filter` provider', agent_test: true do
     let(:definition) do
       {
-        name: 'test_simple_get_filter',
+        name: 'test_simple_get_filter_2',
         features: ['simple_get_filter'],
         attributes:   {
           ensure:      {
@@ -1777,7 +1777,7 @@ def set(_context, _changes, noop: false); end
         },
       }
     end
-    let(:type) { Puppet::Type.type(:test_simple_get_filter) }
+    let(:type) { Puppet::Type.type(:test_simple_get_filter_2) }
     let(:provider_class) do
       Class.new do
         def get(_context, _names = nil)
@@ -1787,11 +1787,11 @@ def get(_context, _names = nil)
         def set(_context, changes) end
       end
     end
-    let(:provider) { instance_double('Puppet::Provider::TestSimpleGetFilter::TestSimpleGetFilter', 'provider') }
+    let(:provider) { instance_double('Puppet::Provider::TestSimpleGetFilter2::TestSimpleGetFilter2', 'provider') }
 
     before(:each) do
-      stub_const('Puppet::Provider::TestSimpleGetFilter', Module.new)
-      stub_const('Puppet::Provider::TestSimpleGetFilter::TestSimpleGetFilter', provider_class)
+      stub_const('Puppet::Provider::TestSimpleGetFilter2', Module.new)
+      stub_const('Puppet::Provider::TestSimpleGetFilter2::TestSimpleGetFilter2', provider_class)
       allow(provider_class).to receive(:new).and_return(provider)
     end
 
@@ -1804,7 +1804,7 @@ def set(_context, changes) end
 
     context 'with the type registered' do
       it 'is seen as a supported feature' do
-        expect(Puppet).not_to receive(:warning).with(%r{Unknown feature detected:.*simple_test_filter})
+        expect(Puppet).not_to receive(:warning).with(%r{Unknown feature detected:.*simple_test_filter_2})
         expect { described_class.register_type(definition) }.not_to raise_error
       end
 

spec/spec_helper.rb

@@ -1,36 +1,4 @@
-if ENV['COVERAGE'] == 'yes'
-  require 'simplecov'
-  require 'simplecov-console'
-  require 'codecov'
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::Codecov,
-  ]
-  SimpleCov.start do
-    track_files 'lib/**/*.rb'
-
-    add_filter 'lib/puppet/resource_api/version.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
-
 require 'bundler/setup'
-require 'puppet/resource_api'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
@@ -52,4 +20,9 @@
   end
 end
 
+# load puppet spec support and coverage setup before loading our code
 require 'puppetlabs_spec_helper/module_spec_helper'
+require 'puppet/resource_api'
+
+# exclude the `version.rb` which already gets loaded by bundler via the gemspec, and doesn't need coverage testing anyways.
+SimpleCov.add_filter 'lib/puppet/resource_api/version.rb' if ENV['SIMPLECOV'] == 'yes'