diff --git a/spec/unit/facter/java_libjvm_path_spec.rb b/spec/unit/facter/java_libjvm_path_spec.rb index 1b1a2e2..3efcb47 100644 --- a/spec/unit/facter/java_libjvm_path_spec.rb +++ b/spec/unit/facter/java_libjvm_path_spec.rb @@ -5,20 +5,21 @@ describe 'java_libjvm_path' do before(:each) do Facter.clear - allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux') - allow(Facter.fact(:java_default_home)).to receive(:value).once.and_return(java_default_home) + allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux') + allow(Facter.fact(:java_default_home)).to receive(:value).and_return(java_default_home) end context 'when libjvm exists' do it do - allow(Dir).to receive(:glob).with("#{java_default_home}/**/lib/**/libjvm.so").and_return(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so']) + allow(Facter.fact(:java_major_version)).to receive(:value).and_return(8) + allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so']) expect(Facter.value(:java_libjvm_path)).to eql '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server' end end context 'when libjvm does not exist' do it do - allow(Dir).to receive(:glob).with("#{java_default_home}/**/lib/**/libjvm.so").and_return([]) + allow(Dir).to receive(:glob).with("#{java_default_home}/lib/**/libjvm.so").and_return([]) expect(Facter.value(:java_libjvm_path)).to be nil end end diff --git a/spec/unit/facter/java_major_version_spec.rb b/spec/unit/facter/java_major_version_spec.rb index b9ead12..3b50e00 100644 --- a/spec/unit/facter/java_major_version_spec.rb +++ b/spec/unit/facter/java_major_version_spec.rb @@ -16,7 +16,7 @@ describe 'java_major_version' do context 'when java not present, returns nil' do before :each do - allow(Facter.fact(:java_version)).to receive(:value).and_return('nil') + allow(Facter.fact(:java_version)).to receive(:value).and_return(nil) end it do expect(Facter.fact(:java_major_version).value).to be_nil