fix(ng.$animate): forward cancel to animation runner

Author: Narretz

src/ng/animate.js

@@ -416,8 +416,8 @@ var $AnimateProvider = ['$provide', /** @this */ function($provide) {
        * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
        */
       cancel: function(runner) {
-        if (runner.end) {
-          runner.end();
+        if (runner.cancel) {
+          runner.cancel();
         }
       },
 

test/ng/animateSpec.js

@@ -530,6 +530,33 @@ describe('$animate', function() {
     }));
 
 
+    it('should reject the promise when the animation is cancelled', inject(function(log, $animate, $$rAF, $rootScope) {
+      element = jqLite('<p class="test2">test</p>');
+
+      var addRunner = $animate.addClass(element, 'test1');
+      addRunner.then(function() {
+        log('addClass(test1)success');
+      }).catch(function() {
+        log('addClass(test1)error');
+      });
+
+
+      var removeRunner = $animate.removeClass(element, 'test2');
+      removeRunner.then(function() {
+        log('removeClass(test2)success');
+      }).catch(function() {
+        log('removeClass(test2)error');
+      });
+
+      $rootScope.$digest();
+      expect(log).toEqual([]);
+      $animate.cancel(addRunner);
+      $animate.cancel(removeRunner);
+      $rootScope.$digest();
+      expect(log.toArray()).toEqual(['addClass(test1)error', 'removeClass(test2)error']);
+    }));
+
+
     it('should defer class manipulation until end of digest for SVG', inject(function($rootScope, $animate) {
       if (!window.SVGElement) return;
       setupClassManipulationSpies();