From 81f9612de2b5cf5f8e983e43479ed8d1d24a944a Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Sat, 17 Aug 2013 12:19:54 +0200
Subject: [PATCH] clean up rspecs

---
 spec/lib/common/collections/wp_items_spec.rb  |  5 +-
 .../lib/common/collections/wp_plugins_spec.rb |  5 +-
 spec/lib/common/collections/wp_themes_spec.rb |  5 +-
 .../detectable/passive_detection.html         | 70 +++++++++++--------
 .../detectable/passive_detection_2.html       |  4 --
 .../detectable/passive_detection.html         | 70 +++++++++++--------
 .../detectable/passive_detection_2.html       |  4 --
 .../detectable/passive_detection.html         | 12 +++-
 .../detectable/passive_detection_2.html       |  4 --
 spec/shared_examples/wp_items_detectable.rb   |  5 --
 10 files changed, 99 insertions(+), 85 deletions(-)
 delete mode 100644 spec/samples/common/collections/wp_items/detectable/passive_detection_2.html
 delete mode 100644 spec/samples/common/collections/wp_plugins/detectable/passive_detection_2.html
 delete mode 100644 spec/samples/common/collections/wp_themes/detectable/passive_detection_2.html

diff --git a/spec/lib/common/collections/wp_items_spec.rb b/spec/lib/common/collections/wp_items_spec.rb
index c548f8e1..938d628e 100644
--- a/spec/lib/common/collections/wp_items_spec.rb
+++ b/spec/lib/common/collections/wp_items_spec.rb
@@ -22,9 +22,8 @@ describe WpItems do
                                           WpItem.new(uri, name: 'escaped-url') <<
                                           WpItem.new(uri, name: 'link-tag') <<
                                           WpItem.new(uri, name: 'script-tag') <<
-                                          WpItem.new(uri, name: 'style-tag'),
-
-        passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded')
+                                          WpItem.new(uri, name: 'style-tag') <<
+                                          WpItem.new(uri, name: 'style-tag-import')
       }
     end
   end
diff --git a/spec/lib/common/collections/wp_plugins_spec.rb b/spec/lib/common/collections/wp_plugins_spec.rb
index e500e4cb..85cc2e7f 100644
--- a/spec/lib/common/collections/wp_plugins_spec.rb
+++ b/spec/lib/common/collections/wp_plugins_spec.rb
@@ -23,9 +23,8 @@ describe WpPlugins do
                                             WpPlugin.new(uri, name: 'escaped-url') <<
                                             WpPlugin.new(uri, name: 'link-tag') <<
                                             WpPlugin.new(uri, name: 'script-tag') <<
-                                            WpPlugin.new(uri, name: 'style-tag'),
-
-        passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded')
+                                            WpPlugin.new(uri, name: 'style-tag') <<
+                                            WpPlugin.new(uri, name: 'style-tag-import')
       }
     end
   end
diff --git a/spec/lib/common/collections/wp_themes_spec.rb b/spec/lib/common/collections/wp_themes_spec.rb
index e7cc5172..31843115 100644
--- a/spec/lib/common/collections/wp_themes_spec.rb
+++ b/spec/lib/common/collections/wp_themes_spec.rb
@@ -21,9 +21,8 @@ describe WpThemes do
 
         passive_detection: WpThemes.new << WpTheme.new(uri, name: 'theme1') <<
                                            WpTheme.new(uri, name: 'theme 2') <<
-                                           WpTheme.new(uri, name: 'theme-3'),
-
-        passive_detection2: WpItems.new << WpItem.new(uri, name: 'wp-table-reloaded')
+                                           WpTheme.new(uri, name: 'theme-3') <<
+                                           WpTheme.new(uri, name: 'style-tag-import')
       }
     end
   end
diff --git a/spec/samples/common/collections/wp_items/detectable/passive_detection.html b/spec/samples/common/collections/wp_items/detectable/passive_detection.html
index cc93dee2..ad48427c 100644
--- a/spec/samples/common/collections/wp_items/detectable/passive_detection.html
+++ b/spec/samples/common/collections/wp_items/detectable/passive_detection.html
@@ -1,51 +1,65 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr-FR">
-  <head profile="http://gmpg.org/xfn/11">
+<head profile="http://gmpg.org/xfn/11">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta property="fb:page_id" content="18968879441564"/>
     <title>Example.com</title>
     <link rel="alternate" type="application/rss+xml" title="Example RSS Feed" href="http://example.com/feed"/>
     <link rel="alternate" type="application/atom+xml" title="Example Atom Feed" href="http://example.com/feed/atom"/>
     <link rel="pingback" href="http://example.com/xmlrpc.php"/>
-    <link rel='stylesheet' href='http://example.com/wp-content/items/link-tag/cache/7f8155a5485bc445ed0adb136722b.css?m=1224763007' type='text/css' media='screen'/>
+    <link rel='stylesheet'
+          href='http://example.com/wp-content/items/link-tag/cache/7f8155a5485bc445ed0adb136722b.css?m=1224763007'
+          type='text/css' media='screen'/>
 
     <script type="text/javascript">
-      var TB_pluginPath = 'http://www.welovebug.com/wp-content/items/js-source';
-      var TB_config = {
-        'widget_show_photos':true,
-        'widget_show_source':true,
-        'widget_show_header':true,
-        'general_link_screen_names':true,
-        'general_link_hash_tags':true,
-        'general_link_urls':true,
-        'widget_check_sources':true,
-        'widget_show_user':true
-      }
+        var TB_pluginPath = 'http://www.welovebug.com/wp-content/items/js-source';
+        var TB_config = {
+            'widget_show_photos': true,
+            'widget_show_source': true,
+            'widget_show_header': true,
+            'general_link_screen_names': true,
+            'general_link_hash_tags': true,
+            'general_link_urls': true,
+            'widget_check_sources': true,
+            'widget_show_user': true
+        }
     </script>
 
     <style type="text/css">
-      #fancybox-loading.fancybox-ie div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://example.com/wp-content/items/style-tag/fancybox/fancy_loading.png', sizingMethod='scale'); }
+        #fancybox-loading.fancybox-ie div {
+            background: transparent;
+            filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://example.com/wp-content/items/style-tag/fancybox/fancy_loading.png', sizingMethod='scale');
+        }
     </style>
 
-    <script type='text/javascript' src='http://example.com/wp-content/items/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
-  </head>
-  <body>
-    <div class="top">
-      <div class="header">
+    <script type='text/javascript'
+            src='http://example.com/wp-content/items/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
+
+    <style type="text/css" media="all">
+            /* <![CDATA[ */
+        @import url("https://example.com/wp-content/items/style-tag-import/css/plugin.css?ver=1.9.4");
+        @import url("https://example.com/wp-content/items/style-tag-import/css/datatables.css?ver=1.9.4");
+            /* ]]> */
+    </style>
+</head>
+<body>
+<div class="top">
+    <div class="header">
         <h1 class="logo">
-          Blablabla the following plugin should not match : /wp-content/items/this-plugin-should-not-match/sub.css
+            Blablabla the following plugin should not match : /wp-content/items/this-plugin-should-not-match/sub.css
         </h1>
-      </div>
     </div>
-  </body>
+</div>
+</body>
 
-  <script type='text/javascript'>
+<script type='text/javascript'>
     /* <![CDATA[ */
-    var pollsL10n = {"ajax_url":"http:\/\/example.com\/wp-content\/items\/escaped-url\/wp-polls.php","text_wait":"Your last request is still being processed. Please wait a while ...","text_valid":"Please choose a valid poll answer.","text_multiple":"Maximum number of choices allowed: ","show_loading":"1","show_fading":"1"};
+    var pollsL10n = {"ajax_url": "http:\/\/example.com\/wp-content\/items\/escaped-url\/wp-polls.php", "text_wait": "Your last request is still being processed. Please wait a while ...", "text_valid": "Please choose a valid poll answer.", "text_multiple": "Maximum number of choices allowed: ", "show_loading": "1", "show_fading": "1"};
     /* ]]> */
-  </script>
-  <script type='text/javascript' src='http://platform.twitter.com/widgets.js?ver=1.0.0'></script>
+</script>
+<script type='text/javascript' src='http://platform.twitter.com/widgets.js?ver=1.0.0'></script>
 
-  <!-- a duplicate one -->
-  <script type='text/javascript' src='http://example.com/wp-content/items/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
+<!-- a duplicate one -->
+<script type='text/javascript'
+        src='http://example.com/wp-content/items/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
 </html>
diff --git a/spec/samples/common/collections/wp_items/detectable/passive_detection_2.html b/spec/samples/common/collections/wp_items/detectable/passive_detection_2.html
deleted file mode 100644
index 0529d0e0..00000000
--- a/spec/samples/common/collections/wp_items/detectable/passive_detection_2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-/* <![CDATA[ */
-@import url("https://site.com/wp-content/items/wp-table-reloaded/css/plugin.css?ver=1.9.4");
-@import url("https://site.com/wp-content/items/wp-table-reloaded/css/datatables.css?ver=1.9.4");
-/* ]]> */
diff --git a/spec/samples/common/collections/wp_plugins/detectable/passive_detection.html b/spec/samples/common/collections/wp_plugins/detectable/passive_detection.html
index 454cf8bb..2ef3f5cb 100644
--- a/spec/samples/common/collections/wp_plugins/detectable/passive_detection.html
+++ b/spec/samples/common/collections/wp_plugins/detectable/passive_detection.html
@@ -1,51 +1,65 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr-FR">
-  <head profile="http://gmpg.org/xfn/11">
+<head profile="http://gmpg.org/xfn/11">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta property="fb:page_id" content="18968879441564"/>
     <title>Example.com</title>
     <link rel="alternate" type="application/rss+xml" title="Example RSS Feed" href="http://example.com/feed"/>
     <link rel="alternate" type="application/atom+xml" title="Example Atom Feed" href="http://example.com/feed/atom"/>
     <link rel="pingback" href="http://example.com/xmlrpc.php"/>
-    <link rel='stylesheet' href='http://example.com/wp-content/plugins/link-tag/cache/7f8155a5485bc445ed0adb136722b.css?m=1224763007' type='text/css' media='screen'/>
+    <link rel='stylesheet'
+          href='http://example.com/wp-content/plugins/link-tag/cache/7f8155a5485bc445ed0adb136722b.css?m=1224763007'
+          type='text/css' media='screen'/>
 
     <script type="text/javascript">
-      var TB_pluginPath = 'http://www.welovebug.com/wp-content/plugins/js-source';
-      var TB_config = {
-        'widget_show_photos':true,
-        'widget_show_source':true,
-        'widget_show_header':true,
-        'general_link_screen_names':true,
-        'general_link_hash_tags':true,
-        'general_link_urls':true,
-        'widget_check_sources':true,
-        'widget_show_user':true
-      }
+        var TB_pluginPath = 'http://www.welovebug.com/wp-content/plugins/js-source';
+        var TB_config = {
+            'widget_show_photos': true,
+            'widget_show_source': true,
+            'widget_show_header': true,
+            'general_link_screen_names': true,
+            'general_link_hash_tags': true,
+            'general_link_urls': true,
+            'widget_check_sources': true,
+            'widget_show_user': true
+        }
     </script>
 
     <style type="text/css">
-      #fancybox-loading.fancybox-ie div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://example.com/wp-content/plugins/style-tag/fancybox/fancy_loading.png', sizingMethod='scale'); }
+        #fancybox-loading.fancybox-ie div {
+            background: transparent;
+            filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://example.com/wp-content/plugins/style-tag/fancybox/fancy_loading.png', sizingMethod='scale');
+        }
     </style>
 
-    <script type='text/javascript' src='http://example.com/wp-content/plugins/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
-  </head>
-  <body>
-    <div class="top">
-      <div class="header">
+    <script type='text/javascript'
+            src='http://example.com/wp-content/plugins/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
+
+    <style type="text/css" media="all">
+            /* <![CDATA[ */
+        @import url("https://example.com/wp-content/plugins/style-tag-import/css/plugin.css?ver=1.9.4");
+        @import url("https://example.com/wp-content/plugins/style-tag-import/css/datatables.css?ver=1.9.4");
+            /* ]]> */
+    </style>
+</head>
+<body>
+<div class="top">
+    <div class="header">
         <h1 class="logo">
-          Blablabla the following plugin should not match : /wp-content/plugins/this-plugin-should-not-match/sub.css
+            Blablabla the following plugin should not match : /wp-content/plugins/this-plugin-should-not-match/sub.css
         </h1>
-      </div>
     </div>
-  </body>
+</div>
+</body>
 
-  <script type='text/javascript'>
+<script type='text/javascript'>
     /* <![CDATA[ */
-    var pollsL10n = {"ajax_url":"http:\/\/example.com\/wp-content\/plugins\/escaped-url\/wp-polls.php","text_wait":"Your last request is still being processed. Please wait a while ...","text_valid":"Please choose a valid poll answer.","text_multiple":"Maximum number of choices allowed: ","show_loading":"1","show_fading":"1"};
+    var pollsL10n = {"ajax_url": "http:\/\/example.com\/wp-content\/plugins\/escaped-url\/wp-polls.php", "text_wait": "Your last request is still being processed. Please wait a while ...", "text_valid": "Please choose a valid poll answer.", "text_multiple": "Maximum number of choices allowed: ", "show_loading": "1", "show_fading": "1"};
     /* ]]> */
-  </script>
-  <script type='text/javascript' src='http://platform.twitter.com/widgets.js?ver=1.0.0'></script>
+</script>
+<script type='text/javascript' src='http://platform.twitter.com/widgets.js?ver=1.0.0'></script>
 
-  <!-- a duplicate one -->
-  <script type='text/javascript' src='http://example.com/wp-content/plugins/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
+<!-- a duplicate one -->
+<script type='text/javascript'
+        src='http://example.com/wp-content/plugins/script-tag/s2member-o.php?ws_plugin__s2member_js_w_globals=1'></script>
 </html>
diff --git a/spec/samples/common/collections/wp_plugins/detectable/passive_detection_2.html b/spec/samples/common/collections/wp_plugins/detectable/passive_detection_2.html
deleted file mode 100644
index 1b6cfd93..00000000
--- a/spec/samples/common/collections/wp_plugins/detectable/passive_detection_2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-/* <![CDATA[ */
-@import url("https://site.com/wp-content/plugins/wp-table-reloaded/css/plugin.css?ver=1.9.4");
-@import url("https://site.com/wp-content/plugins/wp-table-reloaded/css/datatables.css?ver=1.9.4");
-/* ]]> */
diff --git a/spec/samples/common/collections/wp_themes/detectable/passive_detection.html b/spec/samples/common/collections/wp_themes/detectable/passive_detection.html
index 6c364ed4..9f484178 100644
--- a/spec/samples/common/collections/wp_themes/detectable/passive_detection.html
+++ b/spec/samples/common/collections/wp_themes/detectable/passive_detection.html
@@ -8,10 +8,16 @@
     <link rel="alternate" type="application/atom+xml" title="Example Atom Feed" href="http://example.com/feed/atom"/>
     <link rel="pingback" href="http://example.com/xmlrpc.php"/>
 
-    <link type="text/css" rel="stylesheet" href="http://example.localhost/wp-content/themes/theme1/style.css" />
-    <link type="text/css" rel="stylesheet" href="http://example.localhost/wp-content/themes/theme 2/javascript.js" />
-    <link type="text/css" rel="stylesheet" href="http://example.localhost/wp-content/themes/theme-3/test.png" />
+    <link type="text/css" rel="stylesheet" href="http://example.localhost/wp-content/themes/theme1/style.css"/>
+    <link type="text/css" rel="stylesheet" href="http://example.localhost/wp-content/themes/theme 2/javascript.js"/>
+    <link type="text/css" rel="stylesheet" href="http://example.localhost/wp-content/themes/theme-3/test.png"/>
 
+    <style type="text/css" media="all">
+            /* <![CDATA[ */
+        @import url("https://example.com/wp-content/themes/style-tag-import/css/plugin.css?ver=1.9.4");
+        @import url("https://example.com/wp-content/themes/style-tag-import/css/datatables.css?ver=1.9.4");
+            /* ]]> */
+    </style>
 </head>
 <body>
 <div class="top">
diff --git a/spec/samples/common/collections/wp_themes/detectable/passive_detection_2.html b/spec/samples/common/collections/wp_themes/detectable/passive_detection_2.html
deleted file mode 100644
index 3376c9fe..00000000
--- a/spec/samples/common/collections/wp_themes/detectable/passive_detection_2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-/* <![CDATA[ */
-@import url("https://site.com/wp-content/themes/wp-table-reloaded/css/plugin.css?ver=1.9.4");
-@import url("https://site.com/wp-content/themes/wp-table-reloaded/css/datatables.css?ver=1.9.4");
-/* ]]> */
diff --git a/spec/shared_examples/wp_items_detectable.rb b/spec/shared_examples/wp_items_detectable.rb
index f47ea876..44669a8f 100644
--- a/spec/shared_examples/wp_items_detectable.rb
+++ b/spec/shared_examples/wp_items_detectable.rb
@@ -155,11 +155,6 @@ shared_examples 'WpItems::Detectable' do
         @fixture  = fixtures_dir + '/passive_detection.html'
         @expected = expected[:passive_detection]
       end
-
-      it 'returns the expected items' do
-        @fixture  = fixtures_dir + '/passive_detection_2.html'
-        @expected = expected[:passive_detection2]
-      end
     end
   end