From f26ece827c699fc822cab7e114a08c442463f1e7 Mon Sep 17 00:00:00 2001
From: erwanlr <erwan.lr@gmail.com>
Date: Fri, 29 Mar 2013 23:15:29 +0100
Subject: [PATCH] StatsPlugin spec fixes

---
 .../plugins/stats/stats_plugin_spec.rb        | 38 +++++++++----------
 .../wp_plugin/vulnerable/plugins_vulns.xml    |  5 +++
 .../wp_theme/vulnerable/themes_vulns.xml      |  5 +++
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/spec/lib/wpstools/plugins/stats/stats_plugin_spec.rb b/spec/lib/wpstools/plugins/stats/stats_plugin_spec.rb
index 3958641f..10aa1ebb 100644
--- a/spec/lib/wpstools/plugins/stats/stats_plugin_spec.rb
+++ b/spec/lib/wpstools/plugins/stats/stats_plugin_spec.rb
@@ -20,49 +20,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../wpstools_helper')
 
 describe 'StatsPlugin' do
-  before :each do
-    @stats = StatsPlugin.new()
-  end
+  subject(:stats)     { StatsPlugin.new }
+  let(:plugins_vulns) { MODELS_FIXTURES + '/wp_plugin/vulnerable/plugins_vulns.xml' }
+  let(:themes_vulns)  { MODELS_FIXTURES + '/wp_theme/vulnerable/themes_vulns.xml' }
+  let(:plugins_file)  { COLLECTIONS_FIXTURES + '/wp_plugins/detectable/targets.txt' }
+  let(:themes_file)   { COLLECTIONS_FIXTURES + '/wp_themes/detectable/targets.txt'}
 
   describe '#vuln_plugin_count' do
-    it 'should return the correct number' do
-      xml = "#{SPEC_FIXTURES_WPSCAN_WP_PLUGIN_DIR}/vulnerabilities/plugin_vulns.xml"
-      @stats.vuln_plugin_count(xml).should == 2
+    it 'returns the correct number' do
+      stats.vuln_plugin_count(plugins_vulns).should == 2
     end
   end
 
   describe '#vuln_theme_count' do
-    it 'should return the correct number' do
-      xml = "#{SPEC_FIXTURES_WPSCAN_WP_THEME_DIR}/vulnerabilities/theme_vulns.xml"
-      @stats.vuln_theme_count(xml).should == 2
+    it 'returns the correct number' do
+      stats.vuln_theme_count(themes_vulns).should == 2
     end
   end
 
   describe '#plugin_vulns_count' do
-    it 'should return the correct number' do
-      xml = "#{SPEC_FIXTURES_WPSCAN_WP_PLUGIN_DIR}/vulnerabilities/plugin_vulns.xml"
-      @stats.plugin_vulns_count(xml).should == 3
+    it 'returns the correct number' do
+      stats.plugin_vulns_count(plugins_vulns).should == 3
     end
   end
 
   describe '#theme_vulns_count' do
-    it 'should return the correct number' do
-      xml = "#{SPEC_FIXTURES_WPSCAN_WP_THEME_DIR}/vulnerabilities/theme_vulns.xml"
-      @stats.theme_vulns_count(xml).should == 3
+    it 'returns the correct number' do
+      stats.theme_vulns_count(themes_vulns).should == 3
     end
   end
 
   describe '#total_plugins' do
-    it 'should return the correct numer' do
-      file = "#{SPEC_FIXTURES_WPSCAN_WP_PLUGIN_DIR}/plugins.txt"
-      @stats.total_plugins(file).should == 4
+    it 'returns the correct numer' do
+      stats.total_plugins(plugins_file).should == 3
     end
   end
 
   describe '#total_themes' do
-    it 'should return the correct numer' do
-      file = "#{SPEC_FIXTURES_WPSCAN_WP_THEME_DIR}/themes.txt"
-      @stats.total_themes(file).should == 5
+    it 'returns the correct numer' do
+      stats.total_themes(themes_file).should == 3
     end
   end
 end
diff --git a/spec/samples/common/models/wp_plugin/vulnerable/plugins_vulns.xml b/spec/samples/common/models/wp_plugin/vulnerable/plugins_vulns.xml
index 7a6851e5..45ffea40 100644
--- a/spec/samples/common/models/wp_plugin/vulnerable/plugins_vulns.xml
+++ b/spec/samples/common/models/wp_plugin/vulnerable/plugins_vulns.xml
@@ -7,6 +7,11 @@
       <reference>http://ref1.com</reference>
       <type>RCE</type>
     </vulnerability>
+    <vulnerability>
+      <title>Neither do I</title>
+      <reference>http://ref3.com</reference>
+      <type>FPD</type>
+    </vulnerability>
   </plugin>
 
   <plugin name="white-rabbit">
diff --git a/spec/samples/common/models/wp_theme/vulnerable/themes_vulns.xml b/spec/samples/common/models/wp_theme/vulnerable/themes_vulns.xml
index 4401e5f4..5d4121b2 100644
--- a/spec/samples/common/models/wp_theme/vulnerable/themes_vulns.xml
+++ b/spec/samples/common/models/wp_theme/vulnerable/themes_vulns.xml
@@ -7,6 +7,11 @@
       <reference>http://some-ref.com</reference>
       <type>SQLI</type>
     </vulnerability>
+    <vulnerability>
+      <title>Neither do I</title>
+      <reference>http://some-other-ref.com</reference>
+      <type>XSS</type>
+    </vulnerability>
   </theme>
 
   <theme name="the-oracle">