From 2f7db7312ef721a74c266d28e16ae10aee733cf3 Mon Sep 17 00:00:00 2001
From: erwanlr <erwan.lr@gmail.com>
Date: Thu, 18 Apr 2013 12:41:08 +0200
Subject: [PATCH] Remove useless code

---
 lib/common/collections/wp_items/detectable.rb | 9 +--------
 lib/common/models/wp_item/existable.rb        | 5 +----
 spec/shared_examples/wp_item_existable.rb     | 2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/lib/common/collections/wp_items/detectable.rb b/lib/common/collections/wp_items/detectable.rb
index 0cf84062..348c75b4 100755
--- a/lib/common/collections/wp_items/detectable.rb
+++ b/lib/common/collections/wp_items/detectable.rb
@@ -5,7 +5,7 @@ class WpItems < Array
 
     attr_reader :vulns_file, :item_xpath
 
-    # @param [ Wptarget ] wp_target
+    # @param [ WpTarget ] wp_target
     # @param [ Hash ] options
     # @option options [ Boolean ] :show_progression  Whether or not output the progress bar
     # @option options [ Boolean ] :only_vulnerable   Only check for vulnerable items
@@ -13,7 +13,6 @@ class WpItems < Array
     #
     # @return [ WpItems ]
     def aggressive_detection(wp_target, options = {})
-      queue_count      = 0
       browser          = Browser.instance
       hydra            = browser.hydra
       targets          = targets_items(wp_target, options)
@@ -42,12 +41,6 @@ class WpItems < Array
         end
 
         hydra.queue(request)
-        queue_count += 1
-
-        if queue_count == browser.max_threads
-          hydra.run
-          queue_count = 0
-        end
       end
 
       hydra.run
diff --git a/lib/common/models/wp_item/existable.rb b/lib/common/models/wp_item/existable.rb
index 372607a2..f2a6f1b6 100755
--- a/lib/common/models/wp_item/existable.rb
+++ b/lib/common/models/wp_item/existable.rb
@@ -29,10 +29,7 @@ class WpItem
     #
     # @return [ Boolean ]
     def exists_from_response?(response, options = {})
-      # FIXME : The response is supposed to follow locations, so we should not have 301 or 302.
-      # However, due to an issue with Typhoeus or Webmock, the location is not followed in specs
-      # See https://github.com/typhoeus/typhoeus/issues/279
-      if [200, 301, 302, 401, 403].include?(response.code)
+      if [200, 401, 403].include?(response.code)
         if response.has_valid_hash?(options[:error_404_hash], options[:homepage_hash])
           if options[:exclude_content]
             unless response.body.match(options[:exclude_content])
diff --git a/spec/shared_examples/wp_item_existable.rb b/spec/shared_examples/wp_item_existable.rb
index 3e0d2d8f..6a589beb 100644
--- a/spec/shared_examples/wp_item_existable.rb
+++ b/spec/shared_examples/wp_item_existable.rb
@@ -51,7 +51,7 @@ shared_examples 'WpItem::Existable' do
     end
 
     context 'w/o exclude_content' do
-      [200, 301, 302, 401, 403].each do |code|
+      [200, 401, 403].each do |code|
         it "returns true on #{code}" do
           @resp_opt = { code: code, body: '' }
           @expected = true