diff options
| author | Stephen Blott | 2014-12-14 14:17:54 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-14 14:20:54 +0000 |
| commit | 9b8817593af71ddc106c60d44bc967a4bcc553e9 (patch) | |
| tree | e8030195a85189c23dedc3aacb06e3bdc8351460 /tests | |
| parent | 3f3444d1fe72c74439bd9bec3c27ab441ae560a0 (diff) | |
| parent | d42913f75443df565d33ef5c565cd80c31714a60 (diff) | |
| download | vimium-9b8817593af71ddc106c60d44bc967a4bcc553e9.tar.bz2 | |
Merge branch 'vomnibarToPage' of https://github.com/smblott-github/vimium into smblott-github-vomnibarToPage
Conflicts:
background_scripts/main.coffee
content_scripts/vimium.css
content_scripts/vomnibar.coffee
lib/utils.coffee
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dom_tests/dom_tests.html | 16 | ||||
| -rw-r--r-- | tests/dom_tests/vomnibar_test.coffee | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html index feddafac..6378807f 100644 --- a/tests/dom_tests/dom_tests.html +++ b/tests/dom_tests/dom_tests.html @@ -35,9 +35,13 @@ <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> <script type="text/javascript" src="../shoulda.js/shoulda.js"></script> <script type="text/javascript" src="dom_tests.js"></script> @@ -53,5 +57,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 = [] |