diff options
| author | Phil Crosby | 2014-04-30 00:42:42 -0700 |
|---|---|---|
| committer | Phil Crosby | 2014-04-30 00:42:42 -0700 |
| commit | fc23be221270dc11914244f5c93d900ad8e9225c (patch) | |
| tree | 9d676401ce359a28ef76a552e514db590cee3ecd /tests/unit_tests/utils_test.coffee | |
| parent | fa16722613cd60933258edac2c0aa1908fe387bd (diff) | |
| parent | db65721aa67b2de75b1e279f01e721676e83b448 (diff) | |
| download | vimium-fc23be221270dc11914244f5c93d900ad8e9225c.tar.bz2 | |
Merge branch 'smblott-github-sync-chrome-instances'
Conflicts:
tests/unit_tests/utils_test.coffee
Diffstat (limited to 'tests/unit_tests/utils_test.coffee')
| -rw-r--r-- | tests/unit_tests/utils_test.coffee | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee index 91a06135..c4139dbb 100644 --- a/tests/unit_tests/utils_test.coffee +++ b/tests/unit_tests/utils_test.coffee @@ -1,8 +1,10 @@ require "./test_helper.js" +require "./test_chrome_stubs.js" extend(global, require "../../lib/utils.js") Utils.getCurrentVersion = -> '1.43' -global.localStorage = {} +extend(global, require "../../background_scripts/sync.js") extend(global, require "../../background_scripts/settings.js") +Sync.init() context "isUrl", should "accept valid URLs", -> |