From 46d5dcf8f87797d095d478f38bdfe43bf02c4995 Mon Sep 17 00:00:00 2001 From: Christian Mehlmauer Date: Fri, 10 May 2013 20:26:53 +0200 Subject: [PATCH] feedback implemented #179 --- spec/lib/common/version_compare_spec.rb | 32 +++++++++++----------- spec/shared_examples/wp_item_vulnerable.rb | 10 +++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spec/lib/common/version_compare_spec.rb b/spec/lib/common/version_compare_spec.rb index 7cf7966b..5127d297 100644 --- a/spec/lib/common/version_compare_spec.rb +++ b/spec/lib/common/version_compare_spec.rb @@ -7,27 +7,27 @@ describe 'VersionCompare' do context 'version checked is newer' do after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_true } - it 'should return true' do + it 'returns true' do @version1 = '1.0' @version2 = '2.0' end - it 'should return true' do + it 'returns true' do @version1 = '1.0' @version2 = '1.1' end - it 'should return true' do + it 'returns true' do @version1 = '1.0a' @version2 = '1.0b' end - it 'should return true' do + it 'returns true' do @version1 = '1.0' @version2 = '5000000' end - it 'should return true' do + it 'returns true' do @version1 = '0' @version2 = '1' end @@ -36,22 +36,22 @@ describe 'VersionCompare' do context 'version checked is older' do after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false } - it 'should return false' do + it 'returns false' do @version1 = '1' @version2 = '0' end - it 'should return false' do + it 'returns false' do @version1 = '1.0' @version2 = '0.5' end - it 'should return false' do + it 'returns false' do @version1 = '500000' @version2 = '1' end - it 'should return false' do + it 'returns false' do @version1 = '1.6.3.7.3.4' @version2 = '1.2.4.567.679.8.e' end @@ -60,12 +60,12 @@ describe 'VersionCompare' do context 'version checked is the same' do after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_true } - it 'should return true' do + it 'returns true' do @version1 = '1' @version2 = '1' end - it 'should return true' do + it 'returns true' do @version1 = 'a' @version2 = 'a' end @@ -75,7 +75,7 @@ describe 'VersionCompare' do context 'version number causes Gem::Version new Exception' do after { VersionCompare::is_newer_or_same?(@version1, @version2).should be_false } - it 'should return false' do + it 'returns false' do @version1 = 'a' @version2 = 'b' end @@ -84,22 +84,22 @@ describe 'VersionCompare' do context 'one version number is not set' do 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' @version2 = nil end - it 'should return false (version1 nil)' do + it 'returns false (version1 nil)' do @version1 = nil @version2 = '1' end - it 'should return false (version2 empty)' do + it 'returns false (version2 empty)' do @version1 = '1' @version2 = '' end - it 'should return false (version1 empty)' do + it 'returns false (version1 empty)' do @version1 = '' @version2 = '1' end diff --git a/spec/shared_examples/wp_item_vulnerable.rb b/spec/shared_examples/wp_item_vulnerable.rb index 5c25fd44..b42d196e 100644 --- a/spec/shared_examples/wp_item_vulnerable.rb +++ b/spec/shared_examples/wp_item_vulnerable.rb @@ -54,22 +54,22 @@ shared_examples 'WpItem::Vulnerable' do end 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.vulnerable_to?(newer).should be_true 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.vulnerable_to?(older).should be_false 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.vulnerable_to?(same).should be_false 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.vulnerable_to?(no_fixed_info).should be_true end @@ -81,7 +81,7 @@ shared_examples 'WpItem::Vulnerable' do stub_request(:get, /.*\/style\.css/i).to_return(status: 404) 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?(older).should be_true subject.vulnerable_to?(same).should be_true