X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_package_updates_spec.rb;h=08bfb42a342c70770303135ebd97d6cb20739fbd;hb=fd71aedda76f60e87b3a996ab22e9f92af560ec2;hp=c0f54f23af80260a752240f598bfc069ce188377;hpb=7c71390cd15facf38ef7cc5718205d6811b936b6;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/unit/facter/apt_package_updates_spec.rb b/spec/unit/facter/apt_package_updates_spec.rb index c0f54f2..08bfb42 100644 --- a/spec/unit/facter/apt_package_updates_spec.rb +++ b/spec/unit/facter/apt_package_updates_spec.rb @@ -8,7 +8,7 @@ describe 'apt_package_updates fact' do before { Facter.fact(:apt_has_updates).stubs(:value).returns false } - it { should be nil } + it { is_expected.to be nil } end describe 'when apt has updates' do @@ -17,14 +17,14 @@ describe 'apt_package_updates fact' do File.stubs(:executable?) # Stub all other calls Facter::Util::Resolution.stubs(:exec) # Catch all other calls File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true - Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>/dev/null').returns "1;2" - Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check -p 2>/dev/null').returns "puppet-common\nlinux-generic\nlinux-image-generic" + Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "1;2" + Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check -p 2>&1').returns "puppet-common\nlinux-generic\nlinux-image-generic" } it { if Facter.version < '2.0.0' - should == 'puppet-common,linux-generic,linux-image-generic' + is_expected.to eq('puppet-common,linux-generic,linux-image-generic') else - should == ['puppet-common', 'linux-generic', 'linux-image-generic'] + is_expected.to eq(['puppet-common', 'linux-generic', 'linux-image-generic']) end } end