third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation.html - Issue 2960023003: [DevTools] Migrate inspector-protocol/emulation tests to new harness

Unified Diff: third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation.html

Issue 2960023003: [DevTools] Migrate inspector-protocol/emulation tests to new harness (Closed)

Patch Set: 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

« no previous file with comments | « third_party/WebKit/LayoutTests/inspector-protocol/emulation/device-scale-not-persistant-expected.txt ('k') | third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation-test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation.html

diff --git a/third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation-test.js b/third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation.html

similarity index 68%

rename from third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation-test.js

rename to third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation.html

index 3cbf32f61152e1460bb4a09ec29a2904530b4364..d36e0b8406f3a5e34eba388e52aed1adc02c3164 100644

--- a/third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation-test.js

+++ b/third_party/WebKit/LayoutTests/inspector-protocol/resources/device-emulation.html

@@ -1,3 +1,6 @@

+<html>

+<head>

+<script>

function setMetaViewport(override)

{

var VIEWPORTS = {

@@ -105,10 +108,6 @@ function dumpMetrics(full)

testJS("document.body.offsetHeight");

testJS("document.body.scrollHeight");

- var measured = document.querySelectorAll(".device-emulation-measure");

- for (var i = 0; i < measured.length; ++i)

- writeResult("measured " + measured[i].getAttribute("type") + ": " + measured[i].offsetWidth + "x" + measured[i].offsetHeight);

return results.join("\n");

}

@@ -186,74 +185,29 @@ function writeResult(key, val)

{

results.push(key + (val ? " = " + val : ""));

}

+</script>

-var initialize_DeviceEmulationTest = function() {

+<script>

+ // This test is based on http://jsbin.com/urowoh/latest.

+ setMetaViewport();

+</script>

-InspectorTest.getPageMetrics = function(full, callback)

- InspectorTest.evaluateInPage("dumpMetrics(" + full + ")", callback);

+<style>

+html {

+ overflow-x: hidden;

}

-InspectorTest.applyEmulationAndReload = function(enabled, width, height, deviceScaleFactor, viewport, insets, noReload, callback)

- if (enabled) {

- var params = {};

- params.width = width;

- params.height = height;

- params.deviceScaleFactor = deviceScaleFactor;

- params.mobile = true;

- params.fitWindow = false;

- params.scale = 1;

- params.screenWidth = width;

- params.screenHeight = height;

- params.positionX = 0;

- params.positionY = 0;

- if (insets) {

- params.screenWidth += insets.left + insets.right;

- params.positionX = insets.left;

- params.screenHeight += insets.top + insets.bottom;

- params.positionY = insets.top;

- }

- InspectorTest.sendCommand("Emulation.setDeviceMetricsOverride", params, emulateCallback);

- } else {

- InspectorTest.sendCommand("Emulation.clearDeviceMetricsOverride", {}, emulateCallback);

- }

- function emulateCallback(result)

- {

- if (result.error)

- InspectorTest._deviceEmulationResults.push("Error: " + result.error);

- if (noReload)

- callback();

- else

- InspectorTest.navigate(InspectorTest._deviceEmulationPageUrl + "?" + viewport, callback);

- }

-};

-InspectorTest.emulateAndGetMetrics = function(width, height, deviceScaleFactor, viewport, insets, noReload, callback)

- InspectorTest._deviceEmulationResults.push("Emulating device: " + width + "x" + height + "x" + deviceScaleFactor + " viewport='" + viewport + "'");

- var full = !!width && !!height && !!deviceScaleFactor;

- InspectorTest.applyEmulationAndReload(true, width, height, deviceScaleFactor, viewport, insets, noReload, InspectorTest.getPageMetrics.bind(InspectorTest, full, printMetrics));

- function printMetrics(metrics)

- {

- InspectorTest._deviceEmulationResults.push(metrics + "\n");

- callback();

- }

-};

-InspectorTest.testDeviceEmulation = function(pageUrl, width, height, deviceScaleFactor, viewport, insets, noReload)

- InspectorTest._deviceEmulationPageUrl = pageUrl;

- InspectorTest._deviceEmulationResults = [];

- InspectorTest.emulateAndGetMetrics(width, height, deviceScaleFactor, viewport, insets, noReload, callback);

- function callback()

- {

- InspectorTest.log(InspectorTest._deviceEmulationResults.join("\n"));

- InspectorTest.completeTest();

- }

-};

+body {

+ margin: 0;

+ min-height: 1000px;

+ overflow-x: hidden;

+body.small {

+ min-height: 100px;

+</style>

+</head>

-};

+<body>

+</body>

+</html>