Hacks to make Vomnibar tests work again

philc · Aug 21, 2014 · de016dc · de016dc
1 parent cc3df59
commit de016dc
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee
@@ -24,6 +24,25 @@ Vomnibar =
       @vomnibarUI.setQuery(options.query)
       @vomnibarUI.update()
 
+  activate: -> @activateWithCompleter {completer:"omni"}
+  activateInNewTab: -> @activateWithCompleter {
+    completer: "omni"
+    selectFirst: false
+    newTab: true
+  }
+  activateTabSelection: -> @activateWithCompleter {
+    completer: "tabs"
+    selectFirst: true
+  }
+  activateBookmarks: -> @activateWithCompleter {
+    completer: "bookmarks"
+    selectFirst: true
+  }
+  activateBookmarksInNewTab: -> @activateWithCompleter {
+    completer: "bookmarks"
+    selectFirst: true
+    newTab: true
+  }
   getUI: -> @vomnibarUI
 
 
@@ -72,11 +91,13 @@ class VomnibarUI
 
   updateSize: ->
     if document.readyState == "complete" # Do nothing if we haven't loaded yet
-      chrome.runtime.sendMessage
-        handler: "echo"
-        name: "vomnibarResize"
-        frameId: @frameId
-        height: Math.max(@box.getClientRects()[0].height, 55)
+      try
+        height = Math.max(@box.getClientRects()[0].height, 55)
+        chrome.runtime.sendMessage
+          handler: "echo"
+          name: "vomnibarResize"
+          frameId: @frameId
+          height: height
 
   updateSelection: ->
     # We have taken the option to add some global state here (previousCompletionType) to tell if a search

diff --git a/test_harnesses/vomnibar.html b/test_harnesses/vomnibar.html
@@ -11,7 +11,7 @@
   <script type="text/javascript" src="../lib/keyboard_utils.js"></script>
   <script type="text/javascript" src="../lib/dom_utils.js"></script>
   <script src="https://github.com/ooyala/livecss/raw/master/livecss.js"></script>
-  <script type="text/javascript" src="../content_scripts/vomnibar.js"></script>
+  <script type="text/javascript" src="../pages/vomnibar.js"></script>
   <link rel="stylesheet" type="text/css" href="../vimium.css" />
   <script>
     function setup() {

diff --git 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 @@ <h1>Vimium Tests</h1>
 
     <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>