Merge pull request #4975 from imbalind/validate

feature(validation): fix tests on IE and Opera

Author: swalters

src/features/validate/test/uiGridValidateDirective.spec.js

@@ -72,31 +72,31 @@ describe('uiGridValidateDirective', function () {
 
       switch (cellValue) {
         case 'A1':
-          cell.find('input').val('').trigger('input');
+          cell.find('input').controller('ng-model').$setViewValue('');
           event = jQuery.Event("keydown");
           event.keyCode = uiGridConstants.keymap.TAB;
           cell.find('input').trigger(event);
           digest();
           expect(cellContent.classList.contains('invalid')).toBe(true);
           break;
         case 'B1':
-          cell.find('input').val('B').trigger('input');
+          cell.find('input').controller('ng-model').$setViewValue('B');
           event = jQuery.Event("keydown");
           event.keyCode = uiGridConstants.keymap.TAB;
           cell.find('input').trigger(event);
           digest();
           expect(cellContent.classList.contains('invalid')).toBe(true);
           break;
         case 'A2':
-          cell.find('input').val('A').trigger('input');
+          cell.find('input').controller('ng-model').$setViewValue('A');
           event = jQuery.Event("keydown");
           event.keyCode = uiGridConstants.keymap.TAB;
           cell.find('input').trigger(event);
           digest();
           expect(cellContent.classList.contains('invalid')).toBe(false);
           break;
         case 'B2':
-          cell.find('input').val('B2+').trigger('input');
+          cell.find('input').controller('ng-model').$setViewValue('B2+');
           event = jQuery.Event("keydown");
           event.keyCode = uiGridConstants.keymap.TAB;
           cell.find('input').trigger(event);
@@ -121,7 +121,7 @@ describe('uiGridValidateDirective', function () {
     $timeout.flush();
     expect(cell.find('input').length).toBe(1);
 
-    cell.find('input').val('').trigger('input');
+    cell.find('input').controller('ng-model').$setViewValue('');
     event = jQuery.Event("keydown");
     event.keyCode = uiGridConstants.keymap.TAB;
     cell.find('input').trigger(event);
@@ -132,7 +132,7 @@ describe('uiGridValidateDirective', function () {
     $timeout.flush();
     expect(cell.find('input').length).toBe(1);
 
-    cell.find('input').val('A1').trigger('input');
+    cell.find('input').controller('ng-model').$setViewValue('A1');
     event = jQuery.Event("keydown");
     event.keyCode = uiGridConstants.keymap.TAB;
     cell.find('input').trigger(event);
@@ -165,7 +165,7 @@ describe('uiGridValidateDirective', function () {
     $timeout.flush();
     expect(cell.find('input').length).toBe(1);
 
-    cell.find('input').val('B').trigger('input');
+    cell.find('input').controller('ng-model').$setViewValue('B');
     event = jQuery.Event("keydown");
     event.keyCode = uiGridConstants.keymap.TAB;
     cell.find('input').trigger(event);

src/features/validate/test/uiGridValidateService.spec.js

@@ -1,14 +1,12 @@
 describe('ui.grid.validate uiGridValidateService', function () {
   var uiGridValidateService;
   var $rootScope;
-  var $q;
 
   beforeEach(module('ui.grid.validate'));
 
-  beforeEach(inject(function (_uiGridValidateService_, _$rootScope_, _$q_) {
+  beforeEach(inject(function (_uiGridValidateService_, _$rootScope_) {
     uiGridValidateService = _uiGridValidateService_;
     $rootScope = _$rootScope_;
-    $q = _$q_;
   }));
 
   it('should create an empty validatorFactories object', function() {