FM-6634 rubocop fixes

This commit is contained in:
tphoney
2017-12-06 15:46:11 +00:00
parent 77b2b199e4
commit e53b8bb563
8 changed files with 77 additions and 77 deletions

View File

@@ -26,7 +26,7 @@ describe 'java_default_home' do
Facter.fact(:kernel).stubs(:value).returns('Linux')
end
context 'returns java home path when java found in PATH' do
context 'when java found in PATH' do
context 'when java is in /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java' do
it do
unlink_and_delete('./java_test')
@@ -44,7 +44,7 @@ describe 'java_default_home' do
end
end
context 'returns nil when java not present' do
context 'when java not present, return nil' do
it do
Facter::Util::Resolution.stubs(:exec)
Facter::Util::Resolution.expects(:which).with('java').at_least(1).returns(false)

View File

@@ -9,7 +9,7 @@ describe 'java_libjvm_path' do
Dir.stubs(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").returns(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so'])
end
context 'returns libjvm path on Linux' do
context 'when on Linux, return libjvm path' do
it do
expect(Facter.value(:java_libjvm_path)).to eql '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server'
end

View File

@@ -5,7 +5,7 @@ describe 'java_major_version' do
Facter.clear
end
context 'returns major version when java_version fact present' do
context 'when java_version fact present, returns major version' do
before :each do
Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
end
@@ -14,7 +14,7 @@ describe 'java_major_version' do
end
end
context 'returns nil when java not present' do
context 'when java not present, returns nil' do
before :each do
Facter.fact(:java_version).stubs(:value).returns(nil)
end

View File

@@ -5,7 +5,7 @@ describe 'java_patch_level' do
Facter.clear
end
context 'if java is installed returns java patch version extracted from java_version fact' do
context 'when java is installed returns java patch version extracted from java_version fact' do
before :each do
Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
end
@@ -14,7 +14,7 @@ describe 'java_patch_level' do
end
end
context 'if java is not installed returns nil' do
context 'when java is not installed returns nil' do
before :each do
Facter.fact(:java_version).stubs(:value).returns(nil)
end

View File

@@ -15,7 +15,7 @@ describe 'java_version' do
Facter.clear
end
context 'returns java version when java present' do
context 'when java present, returns java version' do
context 'on OpenBSD', with_env: true do
before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
@@ -28,7 +28,7 @@ describe 'java_version' do
expect(Facter.value(:java_version)).to eq('1.7.0_71')
end
end
context 'on Darwin' do
context 'when on Darwin' do
before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
end
@@ -40,7 +40,7 @@ describe 'java_version' do
expect(Facter.value(:java_version)).to eql '1.7.0_71'
end
end
context 'on other systems' do
context 'when on other systems' do
before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
end
@@ -54,7 +54,7 @@ describe 'java_version' do
end
end
context 'returns nil when java not present' do
context 'when java not present, returns nil' do
context 'on OpenBSD', with_env: true do
before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
@@ -66,7 +66,7 @@ describe 'java_version' do
expect(Facter.value(:java_version)).to be_nil
end
end
context 'on Darwin' do
context 'when on Darwin' do
before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
end
@@ -77,7 +77,7 @@ describe 'java_version' do
expect(Facter.value(:java_version)).to be_nil
end
end
context 'on other systems' do
context 'when on other systems' do
before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
end