X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_updates_spec.rb;h=8c726fc343539f101daab2cc64fe80f3588a9b61;hb=ebf9d9f6a629dc69973cad6092080f36ec5af1d6;hp=7e9b77f84f695cecb108c9cc9897ea7254d411a6;hpb=6b23f3cb78301f4ae7b039e7254ce00a675eb211;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/unit/facter/apt_updates_spec.rb b/spec/unit/facter/apt_updates_spec.rb index 7e9b77f..8c726fc 100644 --- a/spec/unit/facter/apt_updates_spec.rb +++ b/spec/unit/facter/apt_updates_spec.rb @@ -8,7 +8,7 @@ describe 'apt_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 @@ -16,10 +16,14 @@ describe 'apt_updates fact' do Facter.fact(:osfamily).stubs(:value).returns 'Debian' 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>&1').returns "14;7" + File.expects(:executable?).with('/usr/bin/apt-get').returns true + Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s upgrade 2>&1').returns ""+ + "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n"+ + "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n"+ + "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"+ + "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" } - it { should == 14 } + it { is_expected.to eq(2) } end end