X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_dist_package_updates_spec.rb;h=43e2d7e7d9adfb8c1f0472992d17fd3406aed95d;hb=refs%2Fheads%2Frelease-prep;hp=952bf5c40d36a6cc71b17a9063f2bceed3c33790;hpb=c5259f83ad20d120d502d8541c75f4ee6021fec8;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/unit/facter/apt_dist_package_updates_spec.rb b/spec/unit/facter/apt_dist_package_updates_spec.rb index 952bf5c..43e2d7e 100644 --- a/spec/unit/facter/apt_dist_package_updates_spec.rb +++ b/spec/unit/facter/apt_dist_package_updates_spec.rb @@ -11,23 +11,25 @@ describe 'apt_package_dist_updates fact' do before(:each) do allow(Facter.fact(:apt_has_dist_updates)).to receive(:value).and_return(false) end - it { is_expected.to be nil } + + it { is_expected.to be_nil } end describe 'when apt has updates' do before(:each) do allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian') allow(File).to receive(:executable?) # Stub all other calls - allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls + allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true) - allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test') + allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test') allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true) apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \ "Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \ - "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" \ - "Conf planet.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" - allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output) + "Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:-backports [all])\n" \ + "Conf planet.rb (22-2~bpo8+1 Debian Backports:-backports [all])\n" + allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output) end + it { is_expected.to eq(['extremetuxracer', 'planet.rb']) } end end