third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get.html - Issue 2130543003: Convert some flexbox tests to testharness.js

Unified Diff: third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get.html

Issue 2130543003: Convert some flexbox tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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

« third_party/WebKit/LayoutTests/css3/flexbox/align-absolute-child.html ('K') | « third_party/WebKit/LayoutTests/css3/flexbox/box-orient-button-expected.txt ('k') | third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get.html

diff --git a/third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get.html b/third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get.html

index 0daa7828bf114d33531d223c942ffd273479b36e..69f47f4ae8603779d9fbb55a61b0b08c7b23a796 100644

--- a/third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get.html

+++ b/third_party/WebKit/LayoutTests/css3/flexbox/display-flexbox-set-get.html

@@ -2,37 +2,41 @@

<html>

<head>

-<script src="../../resources/js-test.js"></script>

+<script src="../../resources/testharness.js"></script>

+<script src="../../resources/testharnessreport.js"></script>

</head>

<body>

+<p>Test that setting and getting display: flex and inline-flex works as expected</p>

+<div id="log"></div>

-description('Test that setting and getting display: flex and inline-flex works as expected');

-debug("Test getting |display| set through CSS");

+test(function() {

var flexboxElement = document.getElementById("flexbox");

-shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'flex'");

+assert_equals(getComputedStyle(flexboxElement, '').getPropertyValue('display'), 'flex');

var inlineFlexboxElement = document.getElementById("flexboxInline");

-shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'inline-flex'");

+assert_equals(getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display'), 'inline-flex');

+}, "Test getting |display| set through CSS");

-debug("");

-debug("Test getting and setting display through JS");

+test(function() {

var element = document.createElement("div");

document.body.appendChild(element);

-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");

+assert_equals(getComputedStyle(element, '').getPropertyValue('display'), 'block');

element.style.display = "flex";

-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'flex'");

+assert_equals(getComputedStyle(element, '').getPropertyValue('display'), 'flex');

element = document.createElement("div");

document.body.appendChild(element);

-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");

+assert_equals(getComputedStyle(element, '').getPropertyValue('display'), 'block');

element.style.display = "inline-flex";

-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-flex'");

+assert_equals(getComputedStyle(element, '').getPropertyValue('display'), 'inline-flex');

element.style.display = "-webkit-flex";

-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'flex'");

+assert_equals(getComputedStyle(element, '').getPropertyValue('display'), 'flex');

element.style.display = "-webkit-inline-flex";

-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-flex'");

+assert_equals(getComputedStyle(element, '').getPropertyValue('display'), 'inline-flex');

+}, "Test getting and setting display through JS");

</script>

</body>

</html>