From 8be6acd660be212926bff495c8e8f83d3f5917be Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 14 Mar 2016 11:42:27 +0000
Subject: Use Chrome frameIds.

---
 tests/dom_tests/dom_tests.coffee | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests')

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
-- 
cgit v1.2.3


From f504fd305e5b2c16b2053a76090ea2618ab42332 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 15 Mar 2016 15:04:10 +0000
Subject: Move isEnabledForUrl to Frame.port.

---
 tests/unit_tests/exclusion_test.coffee | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/unit_tests/exclusion_test.coffee b/tests/unit_tests/exclusion_test.coffee
index 0e4b87bc..e6a47779 100644
--- a/tests/unit_tests/exclusion_test.coffee
+++ b/tests/unit_tests/exclusion_test.coffee
@@ -19,6 +19,8 @@ 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}
+
 # These tests cover only the most basic aspects of excluded URLs and passKeys.
 #
 context "Excluded URLs and pass keys",
-- 
cgit v1.2.3


From d6f8e7301ed43a64df77e9bfa0ef9dd7a263faeb Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 16 Mar 2016 15:02:25 +0000
Subject: Simplify domReady handling.

---
 tests/unit_tests/exclusion_test.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/unit_tests/exclusion_test.coffee b/tests/unit_tests/exclusion_test.coffee
index e6a47779..33b04777 100644
--- a/tests/unit_tests/exclusion_test.coffee
+++ b/tests/unit_tests/exclusion_test.coffee
@@ -19,7 +19,8 @@ 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}
+isEnabledForUrl = (request) ->
+  Frames.isEnabledForUrl {request, tabId: 0, port: postMessage: (id) -> id}
 
 # These tests cover only the most basic aspects of excluded URLs and passKeys.
 #
-- 
cgit v1.2.3


From 16b150c108f72cc7b3e33c6fa46bd5c2d06c71c8 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Thu, 17 Mar 2016 12:35:33 +0000
Subject: Tweaks for #2053.

---
 tests/unit_tests/exclusion_test.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/unit_tests/exclusion_test.coffee b/tests/unit_tests/exclusion_test.coffee
index 33b04777..649dfd1f 100644
--- a/tests/unit_tests/exclusion_test.coffee
+++ b/tests/unit_tests/exclusion_test.coffee
@@ -20,7 +20,7 @@ extend(global, require "../../background_scripts/commands.js")
 extend(global, require "../../background_scripts/main.js")
 
 isEnabledForUrl = (request) ->
-  Frames.isEnabledForUrl {request, tabId: 0, port: postMessage: (id) -> id}
+  Frames.isEnabledForUrl {request, tabId: 0, port: postMessage: (request) -> request}
 
 # These tests cover only the most basic aspects of excluded URLs and passKeys.
 #
-- 
cgit v1.2.3