fix(build): Remove Safari 7 from tests and switch $digest to "$apply"…

… to add $$hashKey to data.
angular-ui · Mar 10, 2018 · 323fa95 · 323fa95
1 parent 25dbd2e
commit 323fa95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js
@@ -78,12 +78,6 @@ var util = module.exports = {
         base: 'SauceLabs',
         browserName: 'firefox'
       },
-      'SL_Safari_7': {
-        base: 'SauceLabs',
-        browserName: 'safari',
-        platform: 'Mac 10.9',
-        version: '7'
-      },
       'SL_Safari_8': {
         base: 'SauceLabs',
         browserName: 'safari',

diff --git a/src/features/resize-columns/test/resizeColumns.spec.js b/src/features/resize-columns/test/resizeColumns.spec.js
@@ -45,7 +45,7 @@ describe('ui.grid.resizeColumns', function () {
       grid = angular.element('<div style="width: 500px; height: 300px" ui-grid="gridOpts" ui-grid-resize-columns></div>');
       document.body.appendChild(grid[0]);
       $compile(grid)($scope);
-      $scope.$digest();
+      $scope.$apply();
       gridScope = $(grid).isolateScope();
     };
 
@@ -138,7 +138,7 @@ describe('ui.grid.resizeColumns', function () {
 
       firstResizer.trigger('dblclick');
 
-      $scope.$digest();
+      $scope.$apply();
 
       var newColWidth = $(grid).find('.' + uiGridConstants.COL_CLASS_PREFIX + '0').first().width();
 
@@ -152,7 +152,7 @@ describe('ui.grid.resizeColumns', function () {
       var firstResizer = $(grid).find('[ui-grid-column-resizer]').first();
 
       firstResizer.trigger(downEvent);
-      $scope.$digest();
+      $scope.$apply();
 
       var overlay = $(grid).find('.ui-grid-resize-overlay');
 
@@ -175,15 +175,15 @@ describe('ui.grid.resizeColumns', function () {
         initialX = firstResizer.position().left;
 
         $(firstResizer).simulate(downEvent, { clientX: initialX });
-        $scope.$digest();
+        $scope.$apply();
 
         // Get the overlay
         overlay = $(grid).find('.ui-grid-resize-overlay');
         initialOverlayX = $(overlay).position().left;
 
         xDiff = 100;
         $(document).simulate(moveEvent, { clientX: initialX + xDiff });
-        $scope.$digest();
+        $scope.$apply();
       });
 
       it('should add the column-resizing class to the grid', function () {
@@ -205,7 +205,7 @@ describe('ui.grid.resizeColumns', function () {
       describe('then releasing the mouse', function () {
         beforeEach(function () {
           $(document).simulate(upEvent, { clientX: initialX + xDiff });
-          $scope.$digest();
+          $scope.$apply();
         });
 
         it('should cause the column to resize by the amount change in the X axis', function () {
@@ -261,10 +261,10 @@ describe('ui.grid.resizeColumns', function () {
         initialX = firstResizer.position().left;
 
         $(firstResizer).simulate(downEvent, { clientX: initialX });
-        $scope.$digest();
+        $scope.$apply();
 
         $(document).simulate(upEvent, { clientX: initialX - minWidth });
-        $scope.$digest();
+        $scope.$apply();
       });
 
       it('should not go below the minWidth less border', function () {
@@ -299,7 +299,7 @@ describe('ui.grid.resizeColumns', function () {
           var firstResizer = $(grid).find('[ui-grid-column-resizer]').first();
 
           $(firstResizer).simulate('dblclick');
-          $scope.$digest();
+          $scope.$apply();
 
           var firstColumnUid = gridScope.grid.columns[0].uid;
 
@@ -317,10 +317,10 @@ describe('ui.grid.resizeColumns', function () {
           initialX = firstResizer.position().left;
 
           $(firstResizer).simulate(downEvent, { clientX: initialX });
-          $scope.$digest();
+          $scope.$apply();
 
           $(document).simulate(upEvent, { clientX: initialX + maxWidth });
-          $scope.$digest();
+          $scope.$apply();
         });
 
         it('should not go above the maxWidth', function () {

diff --git a/src/features/selection/test/uiGridSelectionDirective.spec.js b/src/features/selection/test/uiGridSelectionDirective.spec.js
@@ -19,7 +19,7 @@ describe('ui.grid.selection uiGridSelectionDirective', function() {
     document.body.appendChild(elm[0]);
     $compile(elm)(parentScope);
     $timeout.flush();
-    parentScope.$digest();
+    parentScope.$apply();
 
     return elm;
   }
@@ -89,7 +89,7 @@ describe('ui.grid.selection uiGridSelectionDirective', function() {
       parentScope.options.enableFiltering = false;
       elm.controller('uiGrid').grid.api.core.notifyDataChange( uiGridConstants.dataChange.COLUMN );
       $timeout.flush();
-      parentScope.$digest();
+      parentScope.$apply();
 
       var noFilteringHeight = $(elm).find('.ui-grid-header').height();