aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJez Ng2012-10-23 15:04:03 -0400
committerJez Ng2012-10-23 15:04:03 -0400
commitc128ee99fd8fc5cf5044099f6cb20847fee99b24 (patch)
tree7c09edfc4efddb09536cb0c84f1a62d3a3210d1c
parent213ea560f17a652c164c7dc8fbd9662141794b16 (diff)
downloadvimium-c128ee99fd8fc5cf5044099f6cb20847fee99b24.tar.bz2
Tweak options page description and ensure tests pass.
-rw-r--r--options/options.html4
-rw-r--r--tests/unit_tests/utils_test.coffee1
2 files changed, 3 insertions, 2 deletions
diff --git a/options/options.html b/options/options.html
index 3bce82ce..bee3a4bb 100644
--- a/options/options.html
+++ b/options/options.html
@@ -312,11 +312,11 @@ unmapAll
</td>
</tr>
<tr class="advancedOption">
- <td class="caption">Default Search</td>
+ <td class="caption">Search</td>
<td verticalAlign="top">
<div class="help">
<div class="example">
- Vomnibar fall back URL/search engine if nothing else matches (examples: "http://duckduckgo.com/?q=", "http://www.google.com/search?q=").
+ Set which search engine is used when searching from the Vomnibar (examples: "http://duckduckgo.com/?q=", "http://www.google.com/search?q=").
</div>
</div>
<input id="searchUrl" type="text" />
diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee
index 9da5ff65..3001bb10 100644
--- a/tests/unit_tests/utils_test.coffee
+++ b/tests/unit_tests/utils_test.coffee
@@ -1,5 +1,6 @@
require "./test_helper.js"
extend(global, require "../../lib/utils.js")
+extend(global, require "../../background_scripts/settings.js")
context "isUrl",
should "accept valid URLs", ->