Bug 1467344 - Fix the spelling of canceled/canceling in dom/animation/test/css-transitions/; r=hiro
authorBrian Birtles <birtles@gmail.com>
Thu, 16 Aug 2018 14:41:02 +0900
changeset 487352 9427f6cff88ff691b812846f819c6e93e1ef1aea
parent 487351 5097e03c335b588d7d3a3e369dd4f3785ea908a5
child 487353 fbdd599db4490ea7e651ef7f2a05c5f6584f6c0d
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershiro
bugs1467344
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1467344 - Fix the spelling of canceled/canceling in dom/animation/test/css-transitions/; r=hiro
dom/animation/test/css-transitions/test_animation-cancel.html
dom/animation/test/css-transitions/test_animation-ready.html
dom/animation/test/css-transitions/test_event-dispatch.html
--- a/dom/animation/test/css-transitions/test_animation-cancel.html
+++ b/dom/animation/test/css-transitions/test_animation-cancel.html
@@ -15,35 +15,35 @@ promise_test(async t => {
   div.style.transition = 'margin-left 100s';
   div.style.marginLeft = '1000px';
 
   const transition = div.getAnimations()[0];
   await transition.ready;
   await waitForFrame();
 
   assert_not_equals(getComputedStyle(div).marginLeft, '1000px',
-                    'transform style is animated before cancelling');
+                    'transform style is animated before canceling');
   transition.cancel();
   assert_equals(getComputedStyle(div).marginLeft, div.style.marginLeft,
-                'transform style is no longer animated after cancelling');
-}, 'Animated style is cleared after cancelling a running CSS transition');
+                'transform style is no longer animated after canceling');
+}, 'Animated style is cleared after canceling a running CSS transition');
 
 promise_test(async t => {
   const div = addDiv(t, { style: 'margin-left: 0px' });
   flushComputedStyle(div);
 
   div.style.transition = 'margin-left 100s';
   div.style.marginLeft = '1000px';
 
   const transition = div.getAnimations()[0];
   await transition.ready;
 
   transition.cancel();
   assert_equals(getComputedStyle(div).marginLeft, '1000px',
-                'margin-left style is not animated after cancelling');
+                'margin-left style is not animated after canceling');
   transition.play();
   assert_equals(getComputedStyle(div).marginLeft, '0px',
                 'margin-left style is animated after re-starting transition');
 
   await transition.ready;
 
   assert_equals(transition.playState, 'running',
                 'Transition succeeds in running after being re-started');
@@ -57,49 +57,49 @@ promise_test(async t => {
   div.style.marginLeft = '1000px';
 
   const transition = div.getAnimations()[0];
   await transition.ready;
 
   transition.finish();
   transition.cancel();
   assert_equals(getComputedStyle(div).marginLeft, '1000px',
-                'margin-left style is not animated after cancelling');
+                'margin-left style is not animated after canceling');
   transition.play();
   assert_equals(getComputedStyle(div).marginLeft, '0px',
                 'margin-left style is animated after re-starting transition');
 
   await transition.ready;
 
   assert_equals(transition.playState, 'running',
                 'Transition succeeds in running after being re-started');
-}, 'After cancelling a finished transition, it can still be re-used');
+}, 'After canceling a finished transition, it can still be re-used');
 
 test(t => {
   const div = addDiv(t, { style: 'margin-left: 0px' });
   flushComputedStyle(div);
 
   div.style.transition = 'margin-left 100s';
   div.style.marginLeft = '1000px';
 
   const transition = div.getAnimations()[0];
   transition.cancel();
   assert_equals(getComputedStyle(div).marginLeft, '1000px',
-                'margin-left style is not animated after cancelling');
+                'margin-left style is not animated after canceling');
 
   // Trigger a change to a transition property and check that this
   // doesn't cause the animation to become live again
   div.style.transitionDuration = '200s';
   flushComputedStyle(div);
   assert_equals(getComputedStyle(div).marginLeft, '1000px',
                 'margin-left style is still not animated after updating'
                 + ' transition-duration');
   assert_equals(transition.playState, 'idle',
                 'Transition is still idle after updating transition-duration');
-}, 'After cancelling a transition, updating transition properties doesn\'t make'
+}, 'After canceling a transition, updating transition properties doesn\'t make'
    + ' it live again');
 
 promise_test(async t => {
   const div = addDiv(t, { style: 'margin-left: 0px' });
   flushComputedStyle(div);
 
   div.style.transition = 'margin-left 100s';
   div.style.marginLeft = '1000px';
--- a/dom/animation/test/css-transitions/test_animation-ready.html
+++ b/dom/animation/test/css-transitions/test_animation-ready.html
@@ -49,19 +49,19 @@ promise_test(async t => {
 
   try {
     await readyPromise;
     assert_unreached('ready promise was fulfilled');
   } catch (err) {
     assert_equals(err.name, 'AbortError',
                   'ready promise is rejected with AbortError');
     assert_equals(animation.playState, 'idle',
-                  'Animation is idle after transition was cancelled');
+                  'Animation is idle after transition was canceled');
   }
-}, 'ready promise is rejected when a transition is cancelled by updating'
+}, 'ready promise is rejected when a transition is canceled by updating'
    + ' transition-property');
 
 promise_test(async t => {
   const div = addDiv(t);
 
   // Set up pending transition
   div.style.marginLeft = '0px';
   getComputedStyle(div).marginLeft;
@@ -79,15 +79,15 @@ promise_test(async t => {
 
   try {
     await readyPromise;
     assert_unreached('ready promise was fulfilled');
   } catch (err) {
     assert_equals(err.name, 'AbortError',
                   'ready promise is rejected with AbortError');
     assert_equals(animation.playState, 'idle',
-                  'Animation is idle after transition was cancelled');
+                  'Animation is idle after transition was canceled');
   }
-}, 'ready promise is rejected when a transition is cancelled by changing'
+}, 'ready promise is rejected when a transition is canceled by changing'
    + ' the transition property to something not interpolable');
 
 </script>
 </body>
--- a/dom/animation/test/css-transitions/test_event-dispatch.html
+++ b/dom/animation/test/css-transitions/test_event-dispatch.html
@@ -346,30 +346,30 @@ promise_test(async t => {
   // Make idle
   div.style.display = 'none';
   flushComputedStyle(div);
   await watcher.wait_for('transitioncancel');
 
   transition.cancel();
   // Then wait a couple of frames and check that no event was dispatched
   await waitForAnimationFrames(2);
-}, 'Call Animation.cancel after cancelling transition.');
+}, 'Call Animation.cancel after canceling transition.');
 
 promise_test(async t => {
   const { transition, watcher, div } =
     setupTransition(t, 'margin-left 100s 100s');
 
   await watcher.wait_for('transitionrun');
 
   // Make idle
   transition.cancel();
   transition.play();
   await watcher.wait_for([ 'transitioncancel',
                            'transitionrun' ]);
-}, 'Restart transition after cancelling transition immediately');
+}, 'Restart transition after canceling transition immediately');
 
 promise_test(async t => {
   const { transition, watcher, div } =
     setupTransition(t, 'margin-left 100s 100s');
 
   await watcher.wait_for('transitionrun');
 
   // Make idle