Bug 1311620 - Part 6: Fix test cases that checks keyframe composite is not specified but effect composite is specified. r?birtles draft
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Sat, 24 Dec 2016 19:55:09 +0900
changeset 453699 9e194f4ffc7d7147eb1b4452b33587542802b510
parent 453698 9a38581a2d147cbc30b88c72979534c8a9a86062
child 453700 e04ace66d3543205a96cab23e0d321b334d75e18
push id39729
push userhiikezoe@mozilla-japan.org
push dateSat, 24 Dec 2016 11:23:17 +0000
reviewersbirtles
bugs1311620
milestone53.0a1
Bug 1311620 - Part 6: Fix test cases that checks keyframe composite is not specified but effect composite is specified. r?birtles From spec <https://w3c.github.io/web-animations/#dom-keyframeeffectreadonly-getkeyframes>: composite The keyframe-specific composite operation used to combine the values specified in this keyframe with the underlying value. This member will be absent if the composite operation specified on the keyframe effect is being used. MozReview-Commit-ID: 8ob59Xv6DRL
testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/constructor.html.ini
testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/constructor.html
deleted file mode 100644
--- a/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/constructor.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[constructor.html]
-  type: testharness
-  [composite values are parsed correctly when passed to the KeyframeEffectReadOnly constructor in KeyframeTimingOptions]
-    expected: FAIL
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1311620
-
--- a/testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/constructor.html
+++ b/testing/web-platform/tests/web-animations/interfaces/KeyframeEffect/constructor.html
@@ -105,28 +105,28 @@ test(function(t) {
 }, "composite values are parsed correctly when passed to the " +
    "KeyframeEffectReadOnly constructor in regular keyframes");
 
 test(function(t) {
   gGoodOptionsCompositeValueTests.forEach(function(composite) {
     var effect = new KeyframeEffectReadOnly(target, {
       left: ["10px", "20px"]
     }, { composite: composite });
-    assert_equals(effect.getKeyframes()[0].composite, composite,
+    assert_equals(effect.getKeyframes()[0].composite, undefined,
                   "resulting composite for '" + composite + "'");
   });
   gBadCompositeValueTests.forEach(function(composite) {
     assert_throws(new TypeError, function() {
       new KeyframeEffectReadOnly(target, {
         left: ["10px", "20px"]
       }, { composite: composite });
     });
   });
-}, "composite values are parsed correctly when passed to the " +
-   "KeyframeEffectReadOnly constructor in KeyframeTimingOptions");
+}, "composite value is absent if the composite operation specified on the " +
+   "keyframe effect is being used");
 
 gPropertyIndexedKeyframesTests.forEach(function(subtest) {
   test(function(t) {
     var effect = new KeyframeEffectReadOnly(target, subtest.input);
     assert_frame_lists_equal(effect.getKeyframes(), subtest.output);
   }, "a KeyframeEffectReadOnly can be constructed with " + subtest.desc);
 
   test(function(t) {