Merge branch 'json_data'

Conflicts: data/plugin_vulns.xml data/theme_vulns.xml
2014-08-01 13:34:34 +02:00
parent c3110a4ab7 721cad75a2
commit ca100ef7e9
50 changed files with 560 additions and 23055 deletions
--- a/spec/lib/common/models/wp_theme_spec.rb
+++ b/spec/lib/common/models/wp_theme_spec.rb
@@ -7,7 +7,7 @@ describe WpTheme do
  it_behaves_like 'WpTheme::Vulnerable'
  it_behaves_like 'WpItem::Vulnerable' do
    let(:options)        { { name: 'the-oracle' } }
-    let(:vulns_file)     { MODELS_FIXTURES + '/wp_theme/vulnerable/themes_vulns.xml' }
+    let(:vulns_file)     { MODELS_FIXTURES + '/wp_theme/vulnerable/themes_vulns.json' }
    let(:expected_refs)  { {
        :url => ['Ref 1', 'Ref 2'],
        :cve => ['2011-001'],