Skip to content

Commit

Permalink
Merge pull request #307 from blkperl/rspec_deprecation_warnings
Browse files Browse the repository at this point in the history
Fix rspec deprecation warnings
  • Loading branch information
blkperl committed Aug 6, 2015
2 parents 708a1da + 2ee7ecc commit 772740a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require 'puppetlabs_spec_helper/module_spec_helper'

RSpec.configure do |c|
c.treat_symbols_as_metadata_keys_with_true_values = true
c.include PuppetlabsSpec::Files

c.before :each do
Expand Down
5 changes: 3 additions & 2 deletions spec/unit/collectd_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
Facter::Util::Resolution.stubs(:which).with("collectd").returns("/usr/sbin/collectd")
sample_collectd_help = File.read(fixtures('facts','collectd_help'))
Facter::Util::Resolution.stubs(:exec).with("collectd -h").returns(sample_collectd_help)
Facter.fact(:collectd_version).value.should == '5.1.0'
expect(Facter.fact(:collectd_version).value).to eq('5.1.0')

end

it 'should be 5.1.0.git according to output' do
Facter::Util::Resolution.stubs(:which).with("collectd").returns("/usr/sbin/collectd")
sample_collectd_help_git = File.read(fixtures('facts','collectd_help_git'))
Facter::Util::Resolution.stubs(:exec).with("collectd -h").returns(sample_collectd_help_git)
Facter.fact(:collectd_version).value.should == '5.1.0.git'
expect(Facter.fact(:collectd_version).value).to eq('5.1.0.git')
end


Expand Down

0 comments on commit 772740a

Please sign in to comment.