RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

(MODULES-10935) - Update fact used on Darwin in java_version unit test

Browse Source
This commit is contained in:
Ryan Dill
2021-02-16 20:39:24 -08:00
parent 595dc6df93
commit c3a5d55989
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/unit/facter/java_version_spec.rb
View File

@@ -32,9 +32,9 @@ describe 'java_version' do
end end
context 'when on Darwin' do context 'when on Darwin' do
before(:each) do before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin') allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
end end
let(:facts) { { operatingsystem: 'Darwin' } } let(:facts) { { kernel: 'Darwin' } }
it do it do
expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home') expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home')
@@ -71,9 +71,9 @@ describe 'java_version' do
end end
context 'when on Darwin' do context 'when on Darwin' do
before(:each) do before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin') allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
end end
let(:facts) { { operatingsystem: 'Darwin' } } let(:facts) { { kernel: 'Darwin' } }
it do it do
expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').at_least(1).and_return('Unable to find any JVMs matching version "(null)".') expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').at_least(1).and_return('Unable to find any JVMs matching version "(null)".')