X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_dist_has_updates_spec.rb;h=b5b05b6f054705c7ccc4dcadaa6c0b3a743a9d1a;hb=ec7f4e29c6f57ee9250c65432ee0051282367760;hp=f6302416681ca943281ca65bc13992f79226354b;hpb=1192618d075d30a8131f8cfff6af79f42c85d6a3;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/unit/facter/apt_dist_has_updates_spec.rb b/spec/unit/facter/apt_dist_has_updates_spec.rb index f630241..b5b05b6 100644 --- a/spec/unit/facter/apt_dist_has_updates_spec.rb +++ b/spec/unit/facter/apt_dist_has_updates_spec.rb @@ -11,6 +11,7 @@ describe 'apt_has_dist_updates fact' do before(:each) do allow(Facter.fact(:osfamily)).to receive(:value).once.and_return('Redhat') end + it { is_expected.to be_nil } end @@ -20,6 +21,7 @@ describe 'apt_has_dist_updates fact' do allow(File).to receive(:executable?) # Stub all other calls allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(false) end + it { is_expected.to be_nil } end @@ -27,15 +29,16 @@ describe 'apt_has_dist_updates fact' do before(:each) do allow(Facter.fact(:osfamily)).to receive(:value).once.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') 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:stretch-backports [all])\n" \ "Conf planet.rb (22-2~bpo8+1 Debian Backports:stretch-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) + 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 be true } end end