From c49da9749920bcf5f8c2cc9eccf8fe6a0db5f9b0 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Tue, 15 Sep 2015 13:58:17 +0900
Subject: [PATCH] Bug 1203009 part 6 - Add tests for new composite order;
 r=heycam

---
 .../file_timeline-get-animations.html         | 50 +++++++++++++++++++
 dom/animation/test/testcommon.js              | 12 +++++
 2 files changed, 62 insertions(+)

diff --git a/dom/animation/test/css-animations/file_timeline-get-animations.html b/dom/animation/test/css-animations/file_timeline-get-animations.html
index 33ef73d79ace..a0357d0e0d9e 100644
--- a/dom/animation/test/css-animations/file_timeline-get-animations.html
+++ b/dom/animation/test/css-animations/file_timeline-get-animations.html
@@ -144,6 +144,54 @@ test(function(t) {
   });
 }, 'Order of CSS Animations - across and within elements');
 
+test(function(t) {
+  cancelAllAnimationsOnEnd(t);
+
+  var div = addDiv(t, { style: 'animation: animLeft 100s, animTop 100s' });
+  var animLeft = document.timeline.getAnimations()[0];
+  assert_equals(animLeft.animationName, 'animLeft',
+                'Originally, animLeft animation comes first');
+
+  // Disassociate animLeft from markup and restart
+  div.style.animation = 'animTop 100s';
+  animLeft.play();
+
+  var animations = document.timeline.getAnimations();
+  assert_equals(animations.length, 2,
+                'getAnimations returns markup-bound and free animations');
+  assert_equals(animations[0].animationName, 'animTop',
+                'Markup-bound animations come first');
+  assert_equals(animations[1], animLeft, 'Free animations come last');
+}, 'Order of CSS Animations - markup-bound vs free animations');
+
+test(function(t) {
+  cancelAllAnimationsOnEnd(t);
+
+  var div = addDiv(t, { style: 'animation: animLeft 100s, animTop 100s' });
+  var animLeft = document.timeline.getAnimations()[0];
+  var animTop  = document.timeline.getAnimations()[1];
+
+  // Disassociate both animations from markup and restart in opposite order
+  div.style.animation = '';
+  animTop.play();
+  animLeft.play();
+
+  var animations = document.timeline.getAnimations();
+  assert_equals(animations.length, 2,
+                'getAnimations returns free animations');
+  assert_equals(animations[0], animTop,
+                'Free animations are returned in the order they are started');
+  assert_equals(animations[1], animLeft,
+                'Animations started later are returned later');
+
+  // Restarting an animation should have no effect
+  animTop.cancel();
+  animTop.play();
+  assert_equals(document.timeline.getAnimations()[0], animTop,
+                'After restarting, the ordering of free animations' +
+                ' does not change');
+}, 'Order of CSS Animations - free animations');
+
 test(function(t) {
   // Add an animation first
   var div = addDiv(t, { style: 'animation: animLeft 100s' });
@@ -191,6 +239,8 @@ test(function(t) {
 }, 'CSS Animations cancelled via the API are not returned');
 
 test(function(t) {
+  cancelAllAnimationsOnEnd(t);
+
   var div = addDiv(t, { style: 'animation: animLeft 100s' });
   var anim = div.getAnimations()[0];
   anim.cancel();
diff --git a/dom/animation/test/testcommon.js b/dom/animation/test/testcommon.js
index 185c0de581c2..17d355293680 100644
--- a/dom/animation/test/testcommon.js
+++ b/dom/animation/test/testcommon.js
@@ -29,6 +29,18 @@ function addDiv(t, attrs) {
   return div;
 }
 
+/**
+ * Some tests cause animations to continue to exist even after their target
+ * element has been removed from the document tree. To ensure that these
+ * animations do not impact other tests we should cancel them when the test
+ * is complete.
+ */
+function cancelAllAnimationsOnEnd(t) {
+  t.add_cleanup(function() {
+    document.timeline.getAnimations().forEach(animation => animation.cancel());
+  });
+}
+
 /**
  * Promise wrapper for requestAnimationFrame.
  */