From fdf592b25ead4c4ec919c1d0e6322d2dba48c1f8 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Thu, 21 Aug 2014 19:50:09 +0100
Subject: Hacks to make Vomnibar tests work again

---
 tests/dom_tests/dom_tests.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests')

diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html
index feddafac..72f54c9d 100644
--- a/tests/dom_tests/dom_tests.html
+++ b/tests/dom_tests/dom_tests.html
@@ -38,6 +38,7 @@
     <script type="text/javascript" src="../../content_scripts/vomnibar.js"></script>
     <script type="text/javascript" src="../../content_scripts/scroller.js"></script>
     <script type="text/javascript" src="../../content_scripts/vimium_frontend.js"></script>
+    <script type="text/javascript" src="../../pages/vomnibar.js"></script>
 
     <script type="text/javascript" src="../shoulda.js/shoulda.js"></script>
     <script type="text/javascript" src="dom_tests.js"></script>
@@ -53,5 +54,12 @@
 
     <div id="output-div"></div>
 
+    <div id="vomnibar" class="vimiumReset">
+      <div class="vimiumReset vomnibarSearchArea">
+        <input type="text" class="vimiumReset">
+      </div>
+      <ul class="vimiumReset"></ul>
+    </div>
+
   </body>
 </html>
-- 
cgit v1.2.3


From d65f265a6ad137be0db4d8c86879e5123a10087b Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Tue, 2 Sep 2014 17:43:41 +0100
Subject: Add comments about moving the Vomnibar to an iframe

---
 tests/dom_tests/dom_tests.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html
index 72f54c9d..e6427e85 100644
--- a/tests/dom_tests/dom_tests.html
+++ b/tests/dom_tests/dom_tests.html
@@ -54,6 +54,9 @@
 
     <div id="output-div"></div>
 
+    <!-- This is a hack to keep Vomnibar tests working after moving it to an iframe.
+         The following are the elements from the iframe so that we can embed the iframe's script without errors.
+         TODO(mrmr1993): Look into rewriting the Vomnibar tests so we don't need this. -->
     <div id="vomnibar" class="vimiumReset">
       <div class="vimiumReset vomnibarSearchArea">
         <input type="text" class="vimiumReset">
-- 
cgit v1.2.3


From 390a9cb85e2a97fbd9d2b1a400deee4b12394337 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Fri, 31 Oct 2014 15:02:37 +0000
Subject: Fix vomnibar/iframe tests.

---
 tests/dom_tests/dom_tests.html       | 5 ++++-
 tests/dom_tests/vomnibar_test.coffee | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html
index e6427e85..6378807f 100644
--- a/tests/dom_tests/dom_tests.html
+++ b/tests/dom_tests/dom_tests.html
@@ -35,7 +35,10 @@
     <script type="text/javascript" src="../../lib/handler_stack.js"></script>
     <script type="text/javascript" src="../../lib/clipboard.js"></script>
     <script type="text/javascript" src="../../content_scripts/link_hints.js"></script>
-    <script type="text/javascript" src="../../content_scripts/vomnibar.js"></script>
+    <!-- TODO(smblott) The following is being overridden by the inclusion of "../../pages/vomnibar.js", below,
+         because they both define the same Vomnibar class/object.  As a result, there are currently no tests
+         testing the DOM aspects of "../../content_scripts/vomnibar.js".
+    <script type="text/javascript" src="../../content_scripts/vomnibar.js"></script>  -->
     <script type="text/javascript" src="../../content_scripts/scroller.js"></script>
     <script type="text/javascript" src="../../content_scripts/vimium_frontend.js"></script>
     <script type="text/javascript" src="../../pages/vomnibar.js"></script>
diff --git a/tests/dom_tests/vomnibar_test.coffee b/tests/dom_tests/vomnibar_test.coffee
index dc2a849f..f7241552 100644
--- a/tests/dom_tests/vomnibar_test.coffee
+++ b/tests/dom_tests/vomnibar_test.coffee
@@ -28,7 +28,7 @@ context "Keep selection within bounds",
     assert.equal -1, ui.selection
 
   should "set selection to position 0 for bookmark completion if possible", ->
-    Vomnibar.activateBookmarks()
+    Vomnibar.activate "completer=bookmark&selectFirst"
     ui = Vomnibar.vomnibarUI
 
     @completions = []
-- 
cgit v1.2.3