amend(gesture): fix hold unit tests

angular · Jan 26, 2015 · f592f21 · f592f21
1 parent 8364fb5
commit f592f21
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/src/core/services/gesture/gesture.js b/src/core/services/gesture/gesture.js
@@ -163,7 +163,7 @@ angular.module('material.core')
       // Because we prevent scroll events, this is necessary.
       if (!this.state.registeredParent) return this.cancel();
 
-      this.state.pos = {x: pointer.x, y: pointer.x};
+      this.state.pos = {x: pointer.x, y: pointer.y};
       this.state.timeout = $timeout(angular.bind(this, function holdDelayFn() {
         this.dispatchEvent(ev, '$md.hold');
         this.cancel(); //we're done!

diff --git a/src/core/services/gesture/gesture.spec.js b/src/core/services/gesture/gesture.spec.js
@@ -245,12 +245,12 @@ describe('$mdGesture', function() {
 
   });
 
-  xdescribe('hold', function() {
+  describe('hold', function() {
 
     it('should call hold after options number of ms', inject(function($mdGesture, $document, $timeout) {
       var holdSpy = jasmine.createSpy('hold');
       var el = angular.element('<div>');
-      $mdGesture.attach(el, 'hold', {
+      $mdGesture.register(el, 'hold', {
         delay: 333
       });
 
@@ -273,7 +273,7 @@ describe('$mdGesture', function() {
     it('should reset timeout if moving > options.maxDistance', inject(function($mdGesture, $document, $timeout) {
       var holdSpy = jasmine.createSpy('hold');
       var el = angular.element('<div>');
-      $mdGesture.attach(el, 'hold', {
+      $mdGesture.register(el, 'hold', {
         delay: 333,
         maxDistance: 10
       });
@@ -286,8 +286,8 @@ describe('$mdGesture', function() {
         target: el[0],
         touches: [{pageX: 100, pageY: 100}]
       });
-      expect($timeout.cancel).not.toHaveBeenCalled();
       expect(holdSpy).not.toHaveBeenCalled();
+      $timeout.cancel.reset();
 
       $document.triggerHandler({
         type: 'touchmove',
@@ -297,38 +297,27 @@ describe('$mdGesture', function() {
       expect($timeout.cancel).toHaveBeenCalled();
       expect(holdSpy).not.toHaveBeenCalled();
 
-      $timeout.flush(333);
-      expect(holdSpy).toHaveBeenCalled();
-      $timeout.verifyNoPendingTasks();
-
-      // Shouldn't call it twice
-      $document.triggerHandler({
-        type: 'touchmove',
-        target: el[0],
-        touches: [{pageX: 50, pageY: 50}]
-      });
       $timeout.verifyNoPendingTasks();
     }));
 
     it('should not reset timeout if moving < options.maxDistance', inject(function($mdGesture, $document, $timeout) {
       var holdSpy = jasmine.createSpy('hold');
       var el = angular.element('<div>');
-      $mdGesture.attach(el, 'hold', {
+      $mdGesture.register(el, 'hold', {
         delay: 333,
         maxDistance: 10
       });
 
       el.on('$md.hold', holdSpy);
-      spyOn($timeout, 'cancel');
 
       $document.triggerHandler({
         type: 'touchstart',
         target: el[0],
         touches: [{pageX: 100, pageY: 100}]
       });
 
+      spyOn($timeout, 'cancel');
       expect(holdSpy).not.toHaveBeenCalled();
-      expect($timeout.cancel).not.toHaveBeenCalled();
 
       $document.triggerHandler({
         type: 'touchmove',