Title: [217834] trunk/LayoutTests
- Revision
- 217834
- Author
- [email protected]
- Date
- 2017-06-06 09:26:03 -0700 (Tue, 06 Jun 2017)
Log Message
Rebaseline and enable media/modern-media-controls/airplay-button
https://bugs.webkit.org/show_bug.cgi?id=172975
<rdar://problem/32588422>
Reviewed by Eric Carlson.
* media/modern-media-controls/airplay-button/airplay-button-expected.txt:
* media/modern-media-controls/airplay-button/airplay-button-on.html: Remove some unnecessary
code, the path to the icon directory is provided directly by media-controls-loader.js.
* media/modern-media-controls/airplay-button/airplay-button.html: Remove the test for the "icon"
CSS class since buttons no longer carry this class. We also update the assumptions to use SVG
assets.
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (217833 => 217834)
--- trunk/LayoutTests/ChangeLog 2017-06-06 16:16:13 UTC (rev 217833)
+++ trunk/LayoutTests/ChangeLog 2017-06-06 16:26:03 UTC (rev 217834)
@@ -1,5 +1,22 @@
2017-06-06 Antoine Quint <[email protected]>
+ Rebaseline and enable media/modern-media-controls/airplay-button
+ https://bugs.webkit.org/show_bug.cgi?id=172975
+ <rdar://problem/32588422>
+
+ Reviewed by Eric Carlson.
+
+ * media/modern-media-controls/airplay-button/airplay-button-expected.txt:
+ * media/modern-media-controls/airplay-button/airplay-button-on.html: Remove some unnecessary
+ code, the path to the icon directory is provided directly by media-controls-loader.js.
+ * media/modern-media-controls/airplay-button/airplay-button.html: Remove the test for the "icon"
+ CSS class since buttons no longer carry this class. We also update the assumptions to use SVG
+ assets.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2017-06-06 Antoine Quint <[email protected]>
+
Update modern media controls testing utilities
https://bugs.webkit.org/show_bug.cgi?id=172976
<rdar://problem/32588432>
Modified: trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-expected.txt (217833 => 217834)
--- trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-expected.txt 2017-06-06 16:16:13 UTC (rev 217833)
+++ trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-expected.txt 2017-06-06 16:26:03 UTC (rev 217834)
@@ -4,12 +4,11 @@
PASS airplayButton.element.localName is "button"
-PASS airplayButton.element.classList.contains("icon") is true
PASS airplayButton.element.classList.contains("airplay") is true
PASS airplayButton.iconName is Icons.Airplay
-PASS airplayButton.element.style.webkitMaskImage.includes("macOS/airplay@") became true
-PASS macOSFullscreenAirplayButton.element.style.webkitMaskImage.includes("macOS/airplay-fullscreen@") became true
-PASS iOSAirplayButton.element.style.webkitMaskImage.includes("iOS/airplay@") became true
+PASS airplayButton.image.element.style.webkitMaskImage.includes("macOS/Airplay.svg") became true
+PASS macOSFullscreenAirplayButton.image.element.style.webkitMaskImage.includes("macOS/Airplay-fullscreen.svg") became true
+PASS iOSAirplayButton.image.element.style.webkitMaskImage.includes("iOS/Airplay.svg") became true
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-on.html (217833 => 217834)
--- trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-on.html 2017-06-06 16:16:13 UTC (rev 217833)
+++ trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button-on.html 2017-06-06 16:26:03 UTC (rev 217834)
@@ -8,8 +8,6 @@
description("Testing the <code>AirplayButton</code> class.");
-iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
-
const airplayButton = new AirplayButton({ layoutTraits: LayoutTraits.macOS });
airplayButton.on = true;
Modified: trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button.html (217833 => 217834)
--- trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button.html 2017-06-06 16:16:13 UTC (rev 217833)
+++ trunk/LayoutTests/media/modern-media-controls/airplay-button/airplay-button.html 2017-06-06 16:26:03 UTC (rev 217834)
@@ -12,7 +12,6 @@
const airplayButton = new AirplayButton({ layoutTraits: LayoutTraits.macOS });
shouldBeEqualToString("airplayButton.element.localName", "button");
-shouldBeTrue('airplayButton.element.classList.contains("icon")');
shouldBeTrue('airplayButton.element.classList.contains("airplay")');
shouldBe("airplayButton.iconName", "Icons.Airplay");
@@ -19,9 +18,9 @@
const macOSFullscreenAirplayButton = new AirplayButton({ layoutTraits: LayoutTraits.macOS | LayoutTraits.Fullscreen });
const iOSAirplayButton = new AirplayButton({ layoutTraits: LayoutTraits.iOS });
-shouldBecomeEqual('airplayButton.element.style.webkitMaskImage.includes("macOS/airplay@")', "true", () => {
- shouldBecomeEqual('macOSFullscreenAirplayButton.element.style.webkitMaskImage.includes("macOS/airplay-fullscreen@")', "true", () => {
- shouldBecomeEqual('iOSAirplayButton.element.style.webkitMaskImage.includes("iOS/airplay@")', "true", finishJSTest);
+shouldBecomeEqual('airplayButton.image.element.style.webkitMaskImage.includes("macOS/Airplay.svg")', "true", () => {
+ shouldBecomeEqual('macOSFullscreenAirplayButton.image.element.style.webkitMaskImage.includes("macOS/Airplay-fullscreen.svg")', "true", () => {
+ shouldBecomeEqual('iOSAirplayButton.image.element.style.webkitMaskImage.includes("iOS/Airplay.svg")', "true", finishJSTest);
});
});
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (217833 => 217834)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-06 16:16:13 UTC (rev 217833)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-06 16:26:03 UTC (rev 217834)
@@ -55,6 +55,7 @@
# The modern-media-controls tests are disabled due to past flakiness and some major code changes.
# As a result, a host of tests need to be updated and being turned on selectively here.
+media/modern-media-controls/airplay-button [ Pass ]
media/modern-media-controls/audio/audio-controls-styles.html [ Pass ]
media/modern-media-controls/audio/audio-controls-metrics.html [ Pass ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (217833 => 217834)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-06 16:16:13 UTC (rev 217833)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-06 16:26:03 UTC (rev 217834)
@@ -1549,6 +1549,7 @@
# The modern-media-controls tests are disabled due to past flakiness and some major code changes.
# As a result, a host of tests need to be updated and being turned on selectively here.
+media/modern-media-controls/airplay-button [ Pass ]
media/modern-media-controls/audio/audio-controls-metrics.html [ Pass ]
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html [ Pass ]
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html [ Pass ]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
