Skip to content

Commit

Permalink
Merge 2a0f8bc into 24e2cd1
Browse files Browse the repository at this point in the history
  • Loading branch information
dcrissman committed Jan 21, 2015
2 parents 24e2cd1 + 2a0f8bc commit 1f87ceb
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -4,3 +4,5 @@
spec/fixtures/manifests
spec/fixtures/modules
Gemfile.lock
coverage/

17 changes: 9 additions & 8 deletions Gemfile
@@ -1,10 +1,11 @@
source "https://rubygems.org"

group :test do
gem "rake"
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.3'
gem "puppet-lint"
gem "rspec-puppet"
gem "puppet-syntax"
gem "puppetlabs_spec_helper"
end
gem "rake"
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.3'
gem "puppet-lint"
gem "rspec-puppet"
gem "puppet-syntax"
gem "puppetlabs_spec_helper"

gem "coveralls", :require => false if RUBY_VERSION.to_f >= 1.9
gem "simplecov", :require => false
14 changes: 13 additions & 1 deletion spec/spec_helper.rb
@@ -1 +1,13 @@
require 'puppetlabs_spec_helper/module_spec_helper'
begin
if ENV["TRAVIS"] && RUBY_VERSION.to_f >= 1.9
require "coveralls"
Coveralls.wear! { add_filter "/spec/" }
else
require "simplecov"
SimpleCov.start { add_filter "/spec/" }
end
rescue
#Running without coverage reports.
end

require 'puppetlabs_spec_helper/module_spec_helper'

0 comments on commit 1f87ceb

Please sign in to comment.