Merge pull request #716 from rodjek/100_coverage

Improve self test coverage

.gitignore

@@ -7,3 +7,4 @@
 /tmp/
 /spec/fixtures/modules/augeas_core/
 /spec/fixtures/modules/stdlib/
+/coverage/

Gemfile

@@ -43,8 +43,9 @@ else
  gem 'sync' if (RUBY_VERSION >= '2.7.0')
 end
 
-if ENV['COVERAGE'] == 'yes'
+if ENV['COVERAGE']
  gem 'coveralls', :require => false
+ gem 'simplecov', :require => false
 end
 
 gem 'win32-taskscheduler', :platforms => [:mingw, :x64_mingw, :mswin]

Rakefile

@@ -35,6 +35,10 @@ namespace :test do
  end
  end
 
+ RSpec::Core::RakeTask.new(:spec_unit) do |t|
+ t.pattern = 'spec/unit/**/*_spec.rb'
+ end
+
  task :setup do
  puppet_version = Gem::Version.new(Puppet.version)
 
@@ -64,6 +68,17 @@ namespace :test do
  end
  end
  end
+
+ task :unit do
+ begin
+ Rake::Task['test:setup'].invoke
+ ENV['COVERAGE'] = 'local'
+ Rake::Task['test:spec_unit'].invoke
+ ensure
+ ENV.delete('COVERAGE')
+ Rake::Task['test:teardown'].invoke
+ end
+ end
 end
 
 task :test do

lib/rspec-puppet/matchers/count_generic.rb

@@ -7,13 +7,15 @@ class CountGeneric
  'Stage[main]',
  ].freeze
 
+ attr_reader :resource_type
+
  def initialize(type, count, *method)
  if type.nil?
  @type = method[0].to_s.gsub(/^have_(.+)_resource_count$/, '\1')
  else
  @type = type
  end
- @referenced_type = referenced_type(@type)
+ @resource_type = referenced_type(@type)
  @expected_number = count.to_i
  end
 
@@ -30,7 +32,7 @@ def matches?(catalogue)
  end
  else
  resources.count do |res|
- res.type == @referenced_type
+ res.type == @resource_type
  end
  end
 
@@ -45,7 +47,7 @@ def description
  desc << "#{@expected_number == 1 ? "class" : "classes" }"
  else
  unless @type == "resource"
- desc << "#{@referenced_type}"
+ desc << "#{@resource_type}"
  end
  desc << "#{@expected_number == 1 ? "resource" : "resources" }"
  end

lib/rspec-puppet/matchers/include_class.rb

@@ -4,7 +4,7 @@ module ManifestMatchers
 
  matcher :include_class do |expected_class|
  match do |catalogue|
- RSpec.deprecate(:include_class, :replacement => :contain_class)
+ RSpec.deprecate('include_class()', :replacement => 'contain_class()')
  catalogue.call.classes.include?(expected_class)
  end
 

spec/classes/test_classes_used_spec.rb

@@ -2,11 +2,11 @@
 
 describe 'test::classes_used' do
  it {
- expect(RSpec).to receive(:deprecate).with(:include_class, {:replacement => :contain_class})
+ expect(RSpec).to receive(:deprecate).with('include_class()', {:replacement => 'contain_class()'})
  should include_class('test::bare_class')
  }
  it {
- expect(RSpec).to receive(:deprecate).with(:include_class, {:replacement => :contain_class})
+ expect(RSpec).to receive(:deprecate).with('include_class()', {:replacement => 'contain_class()'})
  should include_class('test::parameterised_class')
  }
 

spec/spec_helper.rb

@@ -1,10 +1,14 @@
-if ENV['COVERAGE'] == 'yes'
+if ENV['COVERAGE']
  require 'simplecov'
  require 'coveralls'
 
- SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+ if ENV['COVERAGE'] == 'yes'
+ SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+ end
+
  SimpleCov.start do
- add_filter(/^\/spec\//)
+ add_filter %r{^/spec/}
+ add_filter %r{^/vendor/}
  end
 end
 
@@ -21,6 +25,13 @@ def sensitive?
  defined?(::Puppet::Pops::Types::PSensitiveType)
 end
 
+module Helpers
+ def rspec2?
+ RSpec::Version::STRING < '3'
+ end
+ module_function :rspec2?
+end
+
 RSpec.configure do |c|
  c.module_path = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'modules')
  c.manifest_dir = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'manifests')
@@ -31,4 +42,7 @@ def sensitive?
  c.after(:suite) do
  RSpec::Puppet::Coverage.report!(0)
  end
+
+ c.include Helpers
+ c.extend Helpers
 end

spec/spec_helper_unit.rb

@@ -0,0 +1,49 @@
+if ENV['COVERAGE']
+ require 'coveralls'
+ require 'simplecov'
+
+ if ENV['COVERAGE'] == 'yes'
+ SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+ end
+
+ SimpleCov.start do
+ add_filter %r{^/spec/}
+ add_filter %r{^/vendor/}
+ end
+end
+
+require 'rspec-puppet'
+
+module Helpers
+ def rspec2?
+ RSpec::Version::STRING < '3'
+ end
+ module_function :rspec2?
+
+ def test_double(type, *args)
+ if rspec2?
+ double(type.to_s, *args)
+ else
+ instance_double(type, *args)
+ end
+ end
+end
+
+RSpec.configure do |c|
+ c.include Helpers
+ c.extend Helpers
+
+ if Helpers.rspec2?
+ RSpec::Matchers.define :be_truthy do
+ match do |actual|
+ !!actual == true
+ end
+ end
+
+ RSpec::Matchers.define :be_falsey do
+ match do |actual|
+ !!actual == false
+ end
+ end
+ end
+end