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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/extensions/api_test/webnavigation/test_failures.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_clientRedirect.js ('k') | chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.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_failures.js
diff --git a/chrome/test/data/extensions/api_test/webnavigation/test_failures.js b/chrome/test/data/extensions/api_test/webnavigation/test_failures.js
index fedb59ee582941359ffa671a0c35dbcd8ddde818..5f61510eec2925ee52e10025b17c033b046ecf05 100644
--- a/chrome/test/data/extensions/api_test/webnavigation/test_failures.js
+++ b/chrome/test/data/extensions/api_test/webnavigation/test_failures.js
@@ -11,117 +11,144 @@ function runTests() {
// Navigates to a non-existant page.
function nonExistant() {
expect([
- [ "onBeforeNavigate",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/nonexistant.html') }],
- [ "onErrorOccurred",
- { error: "net::ERR_FILE_NOT_FOUND",
- frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/nonexistant.html') }]]);
+ { label: "onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/nonexistant.html') }},
+ { label: "onErrorOccurred",
+ event: "onErrorOccurred",
+ details: { error: "net::ERR_FILE_NOT_FOUND",
+ frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/nonexistant.html') }}],
+ [["onBeforeNavigate", "onErrorOccurred"]]);
chrome.tabs.update(tabId, { url: getURL('failures/nonexistant.html') });
},
// An page that tries to load an non-existant iframe.
function nonExistantIframe() {
expect([
- [ "onBeforeNavigate",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/d.html') }],
- [ "onCommitted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "link",
- url: getURL('failures/d.html') }],
- [ "onBeforeNavigate",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/c.html') }],
- [ "onDOMContentLoaded",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/d.html') }],
- [ "onErrorOccurred",
- { error: "net::ERR_FILE_NOT_FOUND",
- frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/c.html') }],
- [ "onCompleted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/d.html') }]]);
+ { label: "a-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/d.html') }},
+ { label: "a-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "link",
+ url: getURL('failures/d.html') }},
+ { label: "a-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/d.html') }},
+ { label: "a-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/d.html') }},
+ { label: "b-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/c.html') }},
+ { label: "b-onErrorOccurred",
+ event: "onErrorOccurred",
+ details: { error: "net::ERR_FILE_NOT_FOUND",
+ frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/c.html') }}],
+ [navigationOrder("a-"),
+ ["a-onCommitted", "b-onBeforeNavigate", "b-onErrorOccurred",
+ "a-onCompleted"]]);
chrome.tabs.update(tabId, { url: getURL('failures/d.html') });
},
// An iframe navigates to a non-existant page.
function nonExistantIframeNavigation() {
expect([
- [ "onBeforeNavigate",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/a.html') }],
- [ "onCommitted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "link",
- url: getURL('failures/a.html') }],
- [ "onBeforeNavigate",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/b.html') }],
- [ "onDOMContentLoaded",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/a.html') }],
- [ "onCommitted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- transitionQualifiers: [],
- transitionType: "auto_subframe",
- url: getURL('failures/b.html') }],
- [ "onDOMContentLoaded",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/b.html') }],
- [ "onCompleted",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/b.html') }],
- [ "onCompleted",
- { frameId: 0,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/a.html') }],
- [ "onBeforeNavigate",
- { frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/c.html') }],
- [ "onErrorOccurred",
- { error: "net::ERR_FILE_NOT_FOUND",
- frameId: 1,
- tabId: 0,
- timeStamp: 0,
- url: getURL('failures/c.html') }]]);
+ { label: "a-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/a.html') }},
+ { label: "a-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "link",
+ url: getURL('failures/a.html') }},
+ { label: "a-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/a.html') }},
+ { label: "a-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 0,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/a.html') }},
+ { label: "b-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/b.html') }},
+ { label: "b-onCommitted",
+ event: "onCommitted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ transitionQualifiers: [],
+ transitionType: "auto_subframe",
+ url: getURL('failures/b.html') }},
+ { label: "b-onDOMContentLoaded",
+ event: "onDOMContentLoaded",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/b.html') }},
+ { label: "b-onCompleted",
+ event: "onCompleted",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/b.html') }},
+ { label: "c-onBeforeNavigate",
+ event: "onBeforeNavigate",
+ details: { frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/c.html') }},
+ { label: "c-onErrorOccurred",
+ event: "onErrorOccurred",
+ details: { error: "net::ERR_FILE_NOT_FOUND",
+ frameId: 1,
+ tabId: 0,
+ timeStamp: 0,
+ url: getURL('failures/c.html') }}],
+ [ navigationOrder("a-"),
+ navigationOrder("b-"),
+ isIFrameOf("b-", "a-"),
+ isLoadedBy("c-", "b-"),
+ ["c-onBeforeNavigate", "c-onErrorOccurred"]]);
chrome.tabs.update(tabId, { url: getURL('failures/a.html') });
},
]);
« chrome/test/data/extensions/api_test/webnavigation/framework.js ('K') | « chrome/test/data/extensions/api_test/webnavigation/test_clientRedirect.js ('k') | chrome/test/data/extensions/api_test/webnavigation/test_forwardBack.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698