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

Unified Diff: third_party/WebKit/LayoutTests/inspector-protocol/resources/inspector-protocol-test.js

Issue 2955943002: DevTools: migrate inspector-protocol/dom tests to a new test runner (Closed)
Patch Set: rebaseline Created 3 years, 6 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
Index: third_party/WebKit/LayoutTests/inspector-protocol/resources/inspector-protocol-test.js
diff --git a/third_party/WebKit/LayoutTests/inspector-protocol/resources/inspector-protocol-test.js b/third_party/WebKit/LayoutTests/inspector-protocol/resources/inspector-protocol-test.js
index 3c5c850559d06d7bfa813e942d9414f63222a412..5de36aa1565217d959924fc4eda3bdf385f9c048 100644
--- a/third_party/WebKit/LayoutTests/inspector-protocol/resources/inspector-protocol-test.js
+++ b/third_party/WebKit/LayoutTests/inspector-protocol/resources/inspector-protocol-test.js
@@ -23,11 +23,11 @@ var TestRunner = class {
this._log.call(null, text);
}
- logMessage(originalMessage) {
+ logMessage(originalMessage, title) {
var message = JSON.parse(JSON.stringify(originalMessage));
if (message.id)
message.id = '<messageId>';
- const nonStableFields = new Set(['nodeId', 'objectId', 'scriptId', 'timestamp']);
+ const nonStableFields = new Set(['nodeId', 'objectId', 'scriptId', 'timestamp', 'backendNodeId', 'parentId', 'frameId', 'baseURL', 'documentURL']);
var objects = [message];
while (objects.length) {
var object = objects.shift();
@@ -40,7 +40,7 @@ var TestRunner = class {
objects.push(object[key]);
}
}
- this.logObject(message);
+ this.logObject(message, title);
return originalMessage;
}
@@ -191,7 +191,10 @@ TestRunner.Page = class {
if (!message.params.frame.parentId)
callback();
});
- await promise;
+ await Promise.all([
+ promise,
+ session.protocol.Page.onceLoadEventFired()
+ ]);
await session.disconnect();
}
@@ -202,7 +205,7 @@ TestRunner.Page = class {
html = html.replace(/'/g, "\\'").replace(/\n/g, '\\n');
var session = await this.createSession();
- await session.protocol.Runtime.evaluate({expression: `document.body.innerHTML='${html}'`});
+ await session.protocol.Runtime.evaluate({expression: `document.write('${html}');document.close();`});
await session.disconnect();
}
};
@@ -236,6 +239,8 @@ TestRunner.Session = class {
}
async evaluate(code) {
+ if (typeof code === 'function')
+ code = `(${code.toString()})()`;
var response = await this.protocol.Runtime.evaluate({expression: code, returnByValue: true});
if (response.error) {
this._testRunner.log(`Error while evaluating '${code}': ${response.error}`);
@@ -246,6 +251,8 @@ TestRunner.Session = class {
}
async evaluateAsync(code) {
+ if (typeof code === 'function')
+ code = `(${code.toString()})()`;
var response = await this.protocol.Runtime.evaluate({expression: code, returnByValue: true, awaitPromise: true});
if (response.error) {
this._testRunner.log(`Error while evaluating async '${code}': ${response.error}`);

Powered by Google App Engine
This is Rietveld 408576698