Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3826)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/extensions/api_test/webnavigation/test_iframe.js

Issue 7859014: Refactor ExtensionApiTest.WebNavigationEvents* to not rely on window.setTimeout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/test/data/extensions/api_test/webnavigation/framework.js ('K') | « chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.js ('k') | chrome/test/data/extensions/api_test/webnavigation/test_openTab.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/extensions/api_test/webnavigation/test_iframe.js
diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js b/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js
index e33a6acf8d5e903e753e5c5c7433e114ca0fb1aa..58e61c825c9986a54e03e6ef6b0ddddc4ee5a874 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js
+++ b/chrome/test/data/extensions/api_test/webnavigation/test_iframe.js
@@ -12,72 +12,89 @@ function runTests() {
// redirects to c.html.
function iframe() {
expect([
- [ "onBeforeNavigate",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/a.html') }],
- [ "onCommitted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "link",
- url: getURL('iframe/a.html') }],
- [ "onBeforeNavigate",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/b.html') }],
- [ "onDOMContentLoaded",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/a.html') }],
- [ "onCommitted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "auto_subframe",
- url: getURL('iframe/b.html') }],
- [ "onDOMContentLoaded",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/b.html') }],
- [ "onCompleted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/b.html') }],
- [ "onCompleted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/a.html') }],
- [ "onBeforeNavigate",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/c.html') }],
- [ "onCommitted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "manual_subframe",
- url: getURL('iframe/c.html') }],
- [ "onDOMContentLoaded",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/c.html') }],
- [ "onCompleted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/c.html') }]]);
+ { label: "a-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/a.html') }},
+ { label: "a-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "link",
+ url: getURL('iframe/a.html') }},
+ { label: "a-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/a.html') }},
+ { label: "a-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/a.html') }},
+ { label: "b-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/b.html') }},
+ { label: "b-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: getURL('iframe/b.html') }},
+ { label: "b-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/b.html') }},
+ { label: "b-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/b.html') }},
+ { label: "c-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/c.html') }},
+ { label: "c-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: getURL('iframe/c.html') }},
+ { label: "c-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/c.html') }},
+ { label: "c-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/c.html') }}],
+ [ navigationOrder("a-"),
+ navigationOrder("b-"),
+ navigationOrder("c-"),
+ isIFrameOf("b-", "a-"),
+ isLoadedBy("c-", "b-")]);
chrome.tabs.update(tabId, { url: getURL('iframe/a.html') });
},
@@ -86,94 +103,118 @@ function runTests() {
// created by javascript. f.html then navigates to g.html.
function iframeMultiple() {
expect([
- [ "onBeforeNavigate",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/d.html') }],
- [ "onCommitted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "link",
- url: getURL('iframe/d.html') }],
- [ "onBeforeNavigate",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/e.html') }],
- [ "onDOMContentLoaded",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/d.html') }],
- [ "onCommitted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "auto_subframe",
- url: getURL('iframe/e.html') }],
- [ "onDOMContentLoaded",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/e.html') }],
- [ "onBeforeNavigate",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/f.html') }],
- [ "onCompleted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/e.html') }],
- [ "onCommitted",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "auto_subframe",
- url: getURL('iframe/f.html') }],
- [ "onDOMContentLoaded",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/f.html') }],
- [ "onCompleted",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/f.html') }],
- [ "onCompleted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/d.html') }],
- [ "onBeforeNavigate",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/g.html') }],
- [ "onCommitted",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "manual_subframe",
- url: getURL('iframe/g.html') }],
- [ "onDOMContentLoaded",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/g.html') }],
- [ "onCompleted",
- { frameId: 2,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/g.html') }]]);
+ { label: "d-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/d.html') }},
+ { label: "d-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "link",
+ url: getURL('iframe/d.html') }},
+ { label: "d-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/d.html') }},
+ { label: "d-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/d.html') }},
+ { label: "e-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/e.html') }},
+ { label: "e-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: getURL('iframe/e.html') }},
+ { label: "e-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/e.html') }},
+ { label: "e-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/e.html') }},
+ { label: "f-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/f.html') }},
+ { label: "f-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: getURL('iframe/f.html') }},
+ { label: "f-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/f.html') }},
+ { label: "f-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/f.html') }},
+ { label: "g-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/g.html') }},
+ { label: "g-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: getURL('iframe/g.html') }},
+ { label: "g-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/g.html') }},
+ { label: "g-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 2,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/g.html') }}],
+ [ navigationOrder("d-"),
+ navigationOrder("e-"),
+ navigationOrder("f-"),
+ navigationOrder("g-"),
+ isIFrameOf("e-", "d-"),
+ ["d-onDOMContentLoaded", "f-onBeforeNavigate", "f-onCompleted",
+ "d-onCompleted"],
+ isLoadedBy("g-", "f-")]);
chrome.tabs.update(tabId, { url: getURL('iframe/d.html') });
},
@@ -181,72 +222,89 @@ function runTests() {
// on the main frame.
function iframeNavigate() {
expect([
- [ "onBeforeNavigate",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/h.html') }],
- [ "onCommitted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "link",
- url: getURL('iframe/h.html') }],
- [ "onBeforeNavigate",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/i.html') }],
- [ "onDOMContentLoaded",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/h.html') }],
- [ "onCommitted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "auto_subframe",
- url: getURL('iframe/i.html') }],
- [ "onDOMContentLoaded",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/i.html') }],
- [ "onCompleted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/i.html') }],
- [ "onCompleted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/h.html') }],
- [ "onBeforeNavigate",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/c.html') }],
- [ "onCommitted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "link",
- url: getURL('iframe/c.html') }],
- [ "onDOMContentLoaded",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/c.html') }],
- [ "onCompleted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('iframe/c.html') }]]);
+ { label: "h-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/h.html') }},
+ { label: "h-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "link",
+ url: getURL('iframe/h.html') }},
+ { label: "h-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/h.html') }},
+ { label: "h-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/h.html') }},
+ { label: "i-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/i.html') }},
+ { label: "i-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: getURL('iframe/i.html') }},
+ { label: "i-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/i.html') }},
+ { label: "i-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/i.html') }},
+ { label: "c-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/c.html') }},
+ { label: "c-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "link",
+ url: getURL('iframe/c.html') }},
+ { label: "c-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/c.html') }},
+ { label: "c-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('iframe/c.html') }}],
+ [ navigationOrder("h-"),
+ navigationOrder("i-"),
+ navigationOrder("c-"),
+ isIFrameOf("i-", "h-"),
+ isLoadedBy("c-", "i-") ]);
chrome.tabs.update(tabId, { url: getURL('iframe/h.html') });
},
]);
« chrome/test/data/extensions/api_test/webnavigation/framework.js ('K') | « chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.js ('k') | chrome/test/data/extensions/api_test/webnavigation/test_openTab.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698