aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorStephen Blott2016-03-17 13:07:47 +0000
committerStephen Blott2016-03-17 13:07:47 +0000
commit2e197df82a13d3cbc3ad305d08650b1a329bdcad (patch)
tree52753640d0661985d0ca33d74105d9b480fe71bb /tests
parentdfb18315f8806f0b86cc6db6ef0623ad283007f5 (diff)
parente1aee8b4867e3d315d799ba06ba46fa7d7077c0c (diff)
downloadvimium-2e197df82a13d3cbc3ad305d08650b1a329bdcad.tar.bz2
Merge pull request #2053 from smblott-github/use-port-for-frames
Use port for frames
Diffstat (limited to 'tests')
-rw-r--r--tests/dom_tests/dom_tests.coffee1
-rw-r--r--tests/unit_tests/exclusion_test.coffee3
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee
index c58d75d6..53e76fc3 100644
--- a/tests/dom_tests/dom_tests.coffee
+++ b/tests/dom_tests/dom_tests.coffee
@@ -2,6 +2,7 @@
# Install frontend event handlers.
installListeners()
HUD.init()
+Frame.registerFrameId chromeFrameId: 0
installListener = (element, event, callback) ->
element.addEventListener event, (-> callback.apply(this, arguments)), true
diff --git a/tests/unit_tests/exclusion_test.coffee b/tests/unit_tests/exclusion_test.coffee
index 0e4b87bc..649dfd1f 100644
--- a/tests/unit_tests/exclusion_test.coffee
+++ b/tests/unit_tests/exclusion_test.coffee
@@ -19,6 +19,9 @@ extend(global, require "../../background_scripts/exclusions.js")
extend(global, require "../../background_scripts/commands.js")
extend(global, require "../../background_scripts/main.js")
+isEnabledForUrl = (request) ->
+ Frames.isEnabledForUrl {request, tabId: 0, port: postMessage: (request) -> request}
+
# These tests cover only the most basic aspects of excluded URLs and passKeys.
#
context "Excluded URLs and pass keys",