diff options
| author | Stephen Blott | 2014-10-31 12:39:39 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-10-31 12:39:39 +0000 |
| commit | 92f177faac3a14e41c033f4bc1ae95909e90c9ce (patch) | |
| tree | a7b40b2a2d18608a989a7921a55569da5db393e4 /tests | |
| parent | a277fa6332f3aa3c0aa5f2c541f539fb1569c6b9 (diff) | |
| parent | d65f265a6ad137be0db4d8c86879e5123a10087b (diff) | |
| download | vimium-92f177faac3a14e41c033f4bc1ae95909e90c9ce.tar.bz2 | |
Merge vomnibarToPage from @mrmr1993.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dom_tests/dom_tests.html | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/dom_tests/dom_tests.html b/tests/dom_tests/dom_tests.html index feddafac..e6427e85 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,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> |