aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrmr19932014-08-21 19:50:09 +0100
committermrmr19932014-09-17 22:59:50 +0100
commitfdf592b25ead4c4ec919c1d0e6322d2dba48c1f8 (patch)
tree53e16b7f8b0ed331aab8269be44407d0b8a9e14b
parentf9cb424fad03042353e8720398b390dd8b2281d0 (diff)
downloadvimium-fdf592b25ead4c4ec919c1d0e6322d2dba48c1f8.tar.bz2
Hacks to make Vomnibar tests work again
-rw-r--r--pages/vomnibar.coffee19
-rw-r--r--test_harnesses/vomnibar.html2
-rw-r--r--tests/dom_tests/dom_tests.html8
3 files changed, 28 insertions, 1 deletions
diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee
index 5cd37db6..2e51082a 100644
--- 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
diff --git a/test_harnesses/vomnibar.html b/test_harnesses/vomnibar.html
index 4d50e749..820210b0 100644
--- 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
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>