git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 081152f)
Test getting / setting display: -webkit-flexbox and -webkit-flexbox-inline
authorjchaffraix@webkit.org <jchaffraix@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Nov 2011 00:20:14 +0000 (00:20 +0000)
committerjchaffraix@webkit.org <jchaffraix@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Nov 2011 00:20:14 +0000 (00:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=72318

Reviewed by Tony Chang.

Test that covers the change for bug 72296 and also increase our flexbox coverage.

* css3/flexbox/display-flexbox-set-get-expected.txt: Added.
* css3/flexbox/display-flexbox-set-get.html: Added.
* css3/flexbox/resources/display-flexbox-set-get.js: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100211 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/css3/flexbox/display-flexbox-set-get.html [new file with mode: 0755] patch | blob
LayoutTests/css3/flexbox/resources/display-flexbox-set-get.js [new file with mode: 0755] patch | blob

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fadb35c..6ca3d04 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-11-14  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Test getting / setting display: -webkit-flexbox and -webkit-flexbox-inline
+        https://bugs.webkit.org/show_bug.cgi?id=72318
+
+        Reviewed by Tony Chang.
+
+        Test that covers the change for bug 72296 and also increase our flexbox coverage.
+
+        * css3/flexbox/display-flexbox-set-get-expected.txt: Added.
+        * css3/flexbox/display-flexbox-set-get.html: Added.
+        * css3/flexbox/resources/display-flexbox-set-get.js: Added.
+
 2011-11-14  Adam Barth  <abarth@webkit.org>
 
         Cross-origin drag-and-drop prevention ineffective
diff --git a/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt b/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt
new file mode 100644 (file)
index 0000000..876ba35
--- /dev/null
+++ b/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt
@@ -0,0 +1,18 @@
+Test that setting and getting display: -webkit-flexbox and -webkit-inline-flexbox works as expected
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test getting |display| set through CSS
+PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is '-webkit-flexbox'
+PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is '-webkit-inline-flexbox'
+
+Test getting and setting display through JS
+PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
+PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-flexbox'
+PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
+PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-inline-flexbox'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/css3/flexbox/display-flexbox-set-get.html b/LayoutTests/css3/flexbox/display-flexbox-set-get.html
new file mode 100755 (executable)
index 0000000..44b55a6
--- /dev/null
+++ b/LayoutTests/css3/flexbox/display-flexbox-set-get.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<style>
+.flexbox { display: -webkit-flexbox; }
+.flexboxInline { display: -webkit-inline-flexbox; }
+</style>
+<script src="../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<div class="flexbox" id="flexbox"></div>
+<div class="flexboxInline" id="flexboxInline"></div>
+<script src="resources/display-flexbox-set-get.js"></script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/css3/flexbox/resources/display-flexbox-set-get.js b/LayoutTests/css3/flexbox/resources/display-flexbox-set-get.js
new file mode 100755 (executable)
index 0000000..53f460f
--- /dev/null
+++ b/LayoutTests/css3/flexbox/resources/display-flexbox-set-get.js
@@ -0,0 +1,21 @@
+description('Test that setting and getting display: -webkit-flexbox and -webkit-inline-flexbox works as expected');
+
+debug("Test getting |display| set through CSS");
+var flexboxElement = document.getElementById("flexbox");
+shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'-webkit-flexbox'");
+var inlineFlexboxElement = document.getElementById("flexboxInline");
+shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'-webkit-inline-flexbox'");
+
+debug("");
+debug("Test getting and setting display through JS");
+var element = document.createElement("div");
+document.body.appendChild(element);
+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
+element.style.display = "-webkit-flexbox";
+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-flexbox'");
+
+element = document.createElement("div");
+document.body.appendChild(element);
+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
+element.style.display = "-webkit-inline-flexbox";
+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-inline-flexbox'");
Mirror of the WebKit open source project from svn.webkit.org.