Title: [209186] trunk/LayoutTests
Revision
209186
Author
grao...@webkit.org
Date
2016-12-01 10:38:51 -0800 (Thu, 01 Dec 2016)

Log Message

[Modern Media Controls] Fix media/modern-media-controls/status-label/status-label.html
https://bugs.webkit.org/show_bug.cgi?id=165259

Reviewed by Dean Jackson.

We broke the test at media/modern-media-controls/status-label/status-label.html with the
fix for https://bugs.webkit.org/show_bug.cgi?id=165239 since the test would test the
font-family for a StatusLabel which would only inherited to be -apple-system when hosted
in a MediaControls instance. We now remove this assertion and added a dedicated test
for when a StatusLabel is hosted in a MediaControls.

* media/modern-media-controls/status-label/status-label-expected.txt:
* media/modern-media-controls/status-label/status-label-font-expected.txt: Added.
* media/modern-media-controls/status-label/status-label-font.html: Added.
* media/modern-media-controls/status-label/status-label.html:

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (209185 => 209186)


--- trunk/LayoutTests/ChangeLog	2016-12-01 18:35:44 UTC (rev 209185)
+++ trunk/LayoutTests/ChangeLog	2016-12-01 18:38:51 UTC (rev 209186)
@@ -1,3 +1,21 @@
+2016-12-01  Antoine Quint  <grao...@apple.com>
+
+        [Modern Media Controls] Fix media/modern-media-controls/status-label/status-label.html
+        https://bugs.webkit.org/show_bug.cgi?id=165259
+
+        Reviewed by Dean Jackson.
+
+        We broke the test at media/modern-media-controls/status-label/status-label.html with the
+        fix for https://bugs.webkit.org/show_bug.cgi?id=165239 since the test would test the
+        font-family for a StatusLabel which would only inherited to be -apple-system when hosted
+        in a MediaControls instance. We now remove this assertion and added a dedicated test
+        for when a StatusLabel is hosted in a MediaControls.
+
+        * media/modern-media-controls/status-label/status-label-expected.txt:
+        * media/modern-media-controls/status-label/status-label-font-expected.txt: Added.
+        * media/modern-media-controls/status-label/status-label-font.html: Added.
+        * media/modern-media-controls/status-label/status-label.html:
+
 2016-12-01  Ryan Haddad  <ryanhad...@apple.com>
 
         Marking media/modern-media-controls/media-controller/media-controller-fullscreen-ltr.html as failing on mac-wk1.

Modified: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt (209185 => 209186)


--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt	2016-12-01 18:35:44 UTC (rev 209185)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt	2016-12-01 18:38:51 UTC (rev 209186)
@@ -18,7 +18,6 @@
 PASS style.textOverflow is "ellipsis"
 PASS style.whiteSpace is "nowrap"
 PASS style.overflow is "hidden"
-PASS style.fontFamily is "-apple-system"
 PASS style.fontSize is "14px"
 PASS rgba(style.color).r is 255
 PASS rgba(style.color).g is 255

Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font-expected.txt (0 => 209186)


--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font-expected.txt	2016-12-01 18:38:51 UTC (rev 209186)
@@ -0,0 +1,11 @@
+Testing the StatusLabel font is correctly set when hosted in media controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.getComputedStyle(mediaControls.statusLabel.element).fontFamily is "-apple-system"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font.html (0 => 209186)


--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font.html	                        (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-font.html	2016-12-01 18:38:51 UTC (rev 209186)
@@ -0,0 +1,25 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>StatusLabel</code> font is correctly set when hosted in media controls.");
+
+const mediaControls = new MacOSInlineMediaControls({ width: 600, height: 300 });
+mediaControls.showsStartButton = false;
+mediaControls.statusLabel.text = "Hello";
+document.body.appendChild(mediaControls.element);
+
+scheduler.frameDidFire = function()
+{
+    shouldBeEqualToString("window.getComputedStyle(mediaControls.statusLabel.element).fontFamily", "-apple-system");
+    mediaControls.element.remove();
+    debug("");
+    finishJSTest();
+};
+
+</script>
+<script src=""
+</body>

Modified: trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html (209185 => 209186)


--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html	2016-12-01 18:35:44 UTC (rev 209185)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html	2016-12-01 18:38:51 UTC (rev 209186)
@@ -39,7 +39,6 @@
     shouldBeEqualToString("style.textOverflow", "ellipsis");
     shouldBeEqualToString("style.whiteSpace", "nowrap");
     shouldBeEqualToString("style.overflow", "hidden");
-    shouldBeEqualToString("style.fontFamily", "-apple-system");
     shouldBeEqualToString("style.fontSize", "14px");
     shouldBeEqualToRGBAColor("style.color", "rgba(255, 255, 255, 0.572)");
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to