Fix tests

ghiden · Jun 23, 2014 · 085270f · 085270f
1 parent f844723
commit 085270f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/angucomplete-alt.js b/angucomplete-alt.js
@@ -273,8 +273,6 @@ angular.module('angucomplete-alt', [] ).directive('angucompleteAlt', ['$parse',
 
       inputField = elem.find('input');
 
-      inputField.on('keyup', scope.keyPressed);
-
       scope.keyPressed = function(event) {
         if (!(event.which === KEY_UP || event.which === KEY_DW || event.which === KEY_EN)) {
           if (!scope.searchStr || scope.searchStr === '') {
@@ -301,6 +299,8 @@ angular.module('angucomplete-alt', [] ).directive('angucompleteAlt', ['$parse',
         }
       };
 
+      inputField.on('keyup', scope.keyPressed);
+
       elem.on('keydown', function (event) {
         if(event.which === KEY_DW && scope.results) {
           event.preventDefault();

diff --git a/test/angucomplete-alt.spec.js b/test/angucomplete-alt.spec.js
@@ -362,21 +362,22 @@ describe('angucomplete-alt', function() {
       $scope.$digest();
 
       var inputField = element.find('#ex1_value');
-      var e = $.Event('keyup');
-      e.which = 97; // letter: a
+      var eKeyup = $.Event('keyup');
+      eKeyup.which = 97; // letter: a
 
       inputField.val('a');
       inputField.trigger('input');
-      inputField.trigger(e);
+      inputField.trigger(eKeyup);
       $timeout.flush();
       expect(element.find('#ex1_dropdown').length).toBe(1);
 
-      e.which = KEY_DW;
-      inputField.trigger(e);
+      var eKeydown = $.Event('keydown');
+      eKeydown.which = KEY_DW;
+      inputField.trigger(eKeydown);
       expect(element.isolateScope().currentIndex).toBe(0);
 
-      e.which = KEY_EN;
-      inputField.trigger(e);
+      eKeyup.which = KEY_EN;
+      inputField.trigger(eKeyup);
       expect($scope.selectedCountry.originalObject).toEqual({name: 'Afghanistan', code: 'AF'});
 
       expect(element.isolateScope().searchStr).toBe(null);
@@ -517,21 +518,22 @@ describe('angucomplete-alt', function() {
 
       expect(selected).toBe(false);
       var inputField = element.find('#ex1_value');
-      var e = $.Event('keyup');
-      e.which = 97; // letter: a
+      var eKeyup = $.Event('keyup');
+      eKeyup.which = 97; // letter: a
 
       inputField.val('a');
       inputField.trigger('input');
-      inputField.trigger(e);
+      inputField.trigger(eKeyup);
       $timeout.flush();
       expect(element.find('#ex1_dropdown').length).toBe(1);
 
-      e.which = KEY_DW;
-      inputField.trigger(e);
+      var eKeydown = $.Event('keydown');
+      eKeydown.which = KEY_DW;
+      element.trigger(eKeydown);
       expect(element.isolateScope().currentIndex).toBe(0);
 
-      e.which = KEY_EN;
-      inputField.trigger(e);
+      eKeyup.which = KEY_EN;
+      inputField.trigger(eKeyup);
       expect(selected).toBe(true);
     });
   });