aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorStephen Blott2015-02-09 14:17:03 +0000
committerStephen Blott2015-02-09 14:17:03 +0000
commit9f20c33adf75e2e78b35e2cd16f2a0925a72c577 (patch)
treef94654449c387b8b94d34051b2557a0ec99ee8bb /tests
parenta2ab96e858ddb5ec0b9f17e47936b2a571e90ab4 (diff)
parentb0ffde36732eee6a6b114927d45ae4d1e7ab0107 (diff)
downloadvimium-9f20c33adf75e2e78b35e2cd16f2a0925a72c577.tar.bz2
Merge branch 'find-mode-history-for-incognito-mode'
Conflicts: background_scripts/main.coffee
Diffstat (limited to 'tests')
-rw-r--r--tests/unit_tests/test_chrome_stubs.coffee2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/unit_tests/test_chrome_stubs.coffee b/tests/unit_tests/test_chrome_stubs.coffee
index 7f666068..c61d7246 100644
--- a/tests/unit_tests/test_chrome_stubs.coffee
+++ b/tests/unit_tests/test_chrome_stubs.coffee
@@ -46,7 +46,9 @@ exports.chrome =
storage:
# chrome.storage.local
local:
+ get: ->
set: ->
+ remove: ->
# chrome.storage.onChanged
onChanged: