some more work for #179

This commit is contained in:
Christian Mehlmauer
2013-05-06 23:36:18 +02:00
parent 4ce6396e3f
commit 3e9c51f18e
3 changed files with 11 additions and 4 deletions

View File

@@ -5,6 +5,7 @@ class WpItem
attr_accessor :vulns_file, :vulns_xpath attr_accessor :vulns_file, :vulns_xpath
# Get the vulnerabilities associated to the WpItem # Get the vulnerabilities associated to the WpItem
# Filters out already fixed vulnerabilities
# #
# @return [ Vulnerabilities ] # @return [ Vulnerabilities ]
def vulnerabilities def vulnerabilities

View File

@@ -1,6 +1,14 @@
# encoding: UTF-8 # encoding: UTF-8
class VersionCompare class VersionCompare
# Compares two version strings. Returns true if version1 is equal to version2
# or when version1 is older than version2
#
# @param [ String ] version1
# @param [ String ] version2
#
# @return [ Boolean ]
def self.is_newer_or_same?(version1, version2) def self.is_newer_or_same?(version1, version2)
(version1 == version2) || (Gem::Version.new(version1) < Gem::Version.new(version2)) (version1 == version2) || (Gem::Version.new(version1) < Gem::Version.new(version2))
end end

View File

@@ -12,9 +12,7 @@ shared_examples 'WpItem::Vulnerable' do
describe '#vulnerabilities' do describe '#vulnerabilities' do
let(:empty_file) { MODELS_FIXTURES + '/wp_item/vulnerable/empty.xml' } let(:empty_file) { MODELS_FIXTURES + '/wp_item/vulnerable/empty.xml' }
before do before { stub_request(:get, /.*/) }
stub_request(:get, /.*/)
end
after do after do
subject.vulns_file = @vulns_file subject.vulns_file = @vulns_file