Skip to content

Commit

Permalink
Merge pull request #201 from treydock/fix-rspec-dependency
Browse files Browse the repository at this point in the history
Fixes incompatibility with RSpec 3.0.0
  • Loading branch information
timtim123456 committed Sep 23, 2014
2 parents 389f99e + f7141ea commit c00b64c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
rspecversion = ENV.key?('RSPEC_VERSION') ? "= #{ENV['RSPEC_VERSION']}" : ['>= 2.9']
rspecversion = ENV.key?('RSPEC_VERSION') ? "= #{ENV['RSPEC_VERSION']}" : ['>= 2.9 ', '< 3.0.0']

gem 'rake'
gem 'rspec', rspecversion
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec-puppet/support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def load_catalogue(type)

catalogue = build_catalog(node_name, facts_hash(node_name), code)

RSpec::Puppet::Coverage.filters << "#{type.to_s.capitalize}[#{self.class.display_name.capitalize}]"
RSpec::Puppet::Coverage.filters << "#{type.to_s.capitalize}[#{self.class.description.capitalize}]"

catalogue.to_a.each do |resource|
RSpec::Puppet::Coverage.add(resource)
Expand Down
2 changes: 1 addition & 1 deletion rspec-puppet.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Gem::Specification.new do |s|

s.files = Dir['LICENSE.md', 'README.md', 'lib/**/*', 'bin/**/*']

s.add_dependency 'rspec'
s.add_dependency 'rspec', '< 3.0.0'

s.authors = ['Tim Sharpe']
s.email = '[email protected]'
Expand Down

0 comments on commit c00b64c

Please sign in to comment.