diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dom_tests/chrome.coffee | 3 | ||||
| -rw-r--r-- | tests/dom_tests/dom_tests.html | 16 | ||||
| -rw-r--r-- | tests/dom_tests/vomnibar_test.coffee | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/tests/dom_tests/chrome.coffee b/tests/dom_tests/chrome.coffee index a49a565a..ad4ae74b 100644 --- a/tests/dom_tests/chrome.coffee +++ b/tests/dom_tests/chrome.coffee @@ -10,6 +10,9 @@ root.chrome = { onMessage: { addListener: -> } + onDisconnect: { + addListener: -> + } postMessage: -> } onMessage: { diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html index 750af41d..863c5611 100644 --- a/tests/dom_tests/dom_tests.html +++ b/tests/dom_tests/dom_tests.html @@ -36,9 +36,13 @@ <script type="text/javascript" src="../../lib/clipboard.js"></script> <script type="text/javascript" src="../../content_scripts/ui_component.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> <script type="text/javascript" src="../shoulda.js/shoulda.js"></script> <script type="text/javascript" src="dom_tests.js"></script> @@ -54,5 +58,15 @@ <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"> + </div> + <ul class="vimiumReset"></ul> + </div> + </body> </html> diff --git a/tests/dom_tests/vomnibar_test.coffee b/tests/dom_tests/vomnibar_test.coffee index b414fdfb..f660f96b 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 = [] |