feedback implemented #179

This commit is contained in:
Christian Mehlmauer
2013-05-10 20:26:53 +02:00
parent 5a4dd31ba7
commit 46d5dcf8f8
2 changed files with 21 additions and 21 deletions

View File

@@ -7,27 +7,27 @@ describe 'VersionCompare' do
context 'version checked is newer' do context 'version checked is newer' do
after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_true } after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_true }
it 'should return true' do it 'returns true' do
@version1 = '1.0' @version1 = '1.0'
@version2 = '2.0' @version2 = '2.0'
end end
it 'should return true' do it 'returns true' do
@version1 = '1.0' @version1 = '1.0'
@version2 = '1.1' @version2 = '1.1'
end end
it 'should return true' do it 'returns true' do
@version1 = '1.0a' @version1 = '1.0a'
@version2 = '1.0b' @version2 = '1.0b'
end end
it 'should return true' do it 'returns true' do
@version1 = '1.0' @version1 = '1.0'
@version2 = '5000000' @version2 = '5000000'
end end
it 'should return true' do it 'returns true' do
@version1 = '0' @version1 = '0'
@version2 = '1' @version2 = '1'
end end
@@ -36,22 +36,22 @@ describe 'VersionCompare' do
context 'version checked is older' do context 'version checked is older' do
after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false } after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false }
it 'should return false' do it 'returns false' do
@version1 = '1' @version1 = '1'
@version2 = '0' @version2 = '0'
end end
it 'should return false' do it 'returns false' do
@version1 = '1.0' @version1 = '1.0'
@version2 = '0.5' @version2 = '0.5'
end end
it 'should return false' do it 'returns false' do
@version1 = '500000' @version1 = '500000'
@version2 = '1' @version2 = '1'
end end
it 'should return false' do it 'returns false' do
@version1 = '1.6.3.7.3.4' @version1 = '1.6.3.7.3.4'
@version2 = '1.2.4.567.679.8.e' @version2 = '1.2.4.567.679.8.e'
end end
@@ -60,12 +60,12 @@ describe 'VersionCompare' do
context 'version checked is the same' do context 'version checked is the same' do
after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_true } after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_true }
it 'should return true' do it 'returns true' do
@version1 = '1' @version1 = '1'
@version2 = '1' @version2 = '1'
end end
it 'should return true' do it 'returns true' do
@version1 = 'a' @version1 = 'a'
@version2 = 'a' @version2 = 'a'
end end
@@ -75,7 +75,7 @@ describe 'VersionCompare' do
context 'version number causes Gem::Version new Exception' do context 'version number causes Gem::Version new Exception' do
after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false } after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false }
it 'should return false' do it 'returns false' do
@version1 = 'a' @version1 = 'a'
@version2 = 'b' @version2 = 'b'
end end
@@ -84,22 +84,22 @@ describe 'VersionCompare' do
context 'one version number is not set' do context 'one version number is not set' do
after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false } after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false }
it 'should return false (version2 nil)' do it 'returns false (version2 nil)' do
@version1 = '1' @version1 = '1'
@version2 = nil @version2 = nil
end end
it 'should return false (version1 nil)' do it 'returns false (version1 nil)' do
@version1 = nil @version1 = nil
@version2 = '1' @version2 = '1'
end end
it 'should return false (version2 empty)' do it 'returns false (version2 empty)' do
@version1 = '1' @version1 = '1'
@version2 = '' @version2 = ''
end end
it 'should return false (version1 empty)' do it 'returns false (version1 empty)' do
@version1 = '' @version1 = ''
@version2 = '1' @version2 = '1'
end end

View File

@@ -54,22 +54,22 @@ shared_examples 'WpItem::Vulnerable' do
end end
context 'check basic version comparing' do context 'check basic version comparing' do
it 'should return true because checked version is newer' do it 'returns true because checked version is newer' do
subject.version.should == version_orig subject.version.should == version_orig
subject.vulnerable_to?(newer).should be_true subject.vulnerable_to?(newer).should be_true
end end
it 'should return false because checked version is older' do it 'returns false because checked version is older' do
subject.version.should == version_orig subject.version.should == version_orig
subject.vulnerable_to?(older).should be_false subject.vulnerable_to?(older).should be_false
end end
it 'should return false because checked version is the fixed version' do it 'returns false because checked version is the fixed version' do
subject.version.should == version_orig subject.version.should == version_orig
subject.vulnerable_to?(same).should be_false subject.vulnerable_to?(same).should be_false
end end
it 'should return true because no fixed_in version is provided' do it 'returns true because no fixed_in version is provided' do
subject.version.should == version_orig subject.version.should == version_orig
subject.vulnerable_to?(no_fixed_info).should be_true subject.vulnerable_to?(no_fixed_info).should be_true
end end
@@ -81,7 +81,7 @@ shared_examples 'WpItem::Vulnerable' do
stub_request(:get, /.*\/style\.css/i).to_return(status: 404) stub_request(:get, /.*\/style\.css/i).to_return(status: 404)
end end
it 'should return true because no version can be detected' do it 'returns true because no version can be detected' do
subject.vulnerable_to?(newer).should be_true subject.vulnerable_to?(newer).should be_true
subject.vulnerable_to?(older).should be_true subject.vulnerable_to?(older).should be_true
subject.vulnerable_to?(same).should be_true subject.vulnerable_to?(same).should be_true