diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 16:25:16 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 16:25:16 -0700 |
commit | 4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0 (patch) | |
tree | fb3b511665dd8b7e4555e4f1c803202932de119e /spec/unit/facter/util/puppet_settings_spec.rb | |
parent | 7d4fa05da13577072defe991b9de8b96ac4c3be7 (diff) | |
parent | ffe21fc67491c4502114505c82142781d72720ab (diff) | |
download | puppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.gz puppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.bz2 |
Merge branch 'master' into 4.3.x
Diffstat (limited to 'spec/unit/facter/util/puppet_settings_spec.rb')
-rwxr-xr-x | spec/unit/facter/util/puppet_settings_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/unit/facter/util/puppet_settings_spec.rb b/spec/unit/facter/util/puppet_settings_spec.rb index e77779b..c06137d 100755 --- a/spec/unit/facter/util/puppet_settings_spec.rb +++ b/spec/unit/facter/util/puppet_settings_spec.rb @@ -11,11 +11,11 @@ describe Facter::Util::PuppetSettings do end it 'should be nil' do - subject.with_puppet { Puppet[:vardir] }.should be_nil + expect(subject.with_puppet { Puppet[:vardir] }).to be_nil end it 'should not yield to the block' do Puppet.expects(:[]).never - subject.with_puppet { Puppet[:vardir] }.should be_nil + expect(subject.with_puppet { Puppet[:vardir] }).to be_nil end end context "With Puppet loaded" do @@ -29,7 +29,7 @@ describe Facter::Util::PuppetSettings do subject.with_puppet { Puppet[:vardir] } end it 'should return the nodes vardir' do - subject.with_puppet { Puppet[:vardir] }.should eq vardir + expect(subject.with_puppet { Puppet[:vardir] }).to eq vardir end end end |