Fix e2e footer tests

The values expected were wrong. Also added a promise handler before
looking for expected values when entering a filter value.

[skip ci]

Author: c0bra

misc/tutorial/105_footer.ngdoc

@@ -8,7 +8,7 @@ Total rows in the grid and the number of filtered rows.  Selected rows will be s
 <br/>
 ### Column Footer
 The grid also has column footer, which can be displayed if showColumnFooter option is set to true (default=false).
-You can set an aggregation function for each column or use a custom footer template to display 
+You can set an aggregation function for each column or use a custom footer template to display
 what ever aggregation you wish.
 Aggregation functions supported are: sum, avg, row count, min, max.
 You need to inject the uiGridConstants in order to use aggregationTypes enum.
@@ -22,7 +22,7 @@ and grouping.  In the case of pagination, you'll find that it gives you the tota
 which isn't intuitively what users would expect.  With grouping it will give the total of the currently expanded
 data rows, which again may not be what users intuitively expect.
 
-In the case of grouping the solution is to use the aggregation provided with grouping.  
+In the case of grouping the solution is to use the aggregation provided with grouping.
 
 <br/>
 You can override the default grid footer template with gridOptions.footerTemplate.  Copy the default ui-grid-footer.html from the source as your starting point.  <i>This is not demonstrated in this tutorial.</i>
@@ -106,11 +106,11 @@ You can override the default grid footer template with gridOptions.footerTemplat
       it('grid should have six visible columns', function () {
         gridTestUtils.expectHeaderColumnCount( 'grid1', 7 );
       });
-  
+
       it('grid should have six visible columns in footer', function () {
         gridTestUtils.expectFooterColumnCount( 'grid1', 7 );
       });
-  
+
       it('grid should have footers with specific values', function () {
         gridTestUtils.expectFooterCellValueMatch( 'grid1', 0, '' );
         gridTestUtils.expectFooterCellValueMatch( 'grid1', 1, 'total: 281568' );
@@ -121,17 +121,19 @@ You can override the default grid footer template with gridOptions.footerTemplat
         // gridTestUtils.expectFooterCellValueMatch( 'grid1', 6, 'max: ' + getMaxDateString() );
         // TODO: need to check item count, not done
       });
-  
+
       it('filter and expect recalculate', function () {
-        gridTestUtils.enterFilterInColumn( 'grid1', 1, '3' );        
-        gridTestUtils.expectFooterCellValueMatch( 'grid1', 0, '' );
-        gridTestUtils.expectFooterCellValueMatch( 'grid1', 1, 'total: 19805' );
-        gridTestUtils.expectFooterCellValueMatch( 'grid1', 2, '29.375' );
-        gridTestUtils.expectFooterCellValueMatch( 'grid1', 3, 'min: 20' );
-        gridTestUtils.expectFooterCellValueMatch( 'grid1', 4, 'max: 39' );
-        gridTestUtils.expectFooterCellValueMatch( 'grid1', 5, 'custom template' );
-        // gridTestUtils.expectFooterCellValueMatch( 'grid1', 6, 'max: ' + getMaxDateString() );
-        // TODO: need to check item count, not done
+        gridTestUtils.enterFilterInColumn( 'grid1', 1, '3' )
+          .then(function () {
+            gridTestUtils.expectFooterCellValueMatch( 'grid1', 0, '' );
+            gridTestUtils.expectFooterCellValueMatch( 'grid1', 1, 'total: 68974' );
+            gridTestUtils.expectFooterCellValueMatch( 'grid1', 2, '29.8978102189781' );
+            gridTestUtils.expectFooterCellValueMatch( 'grid1', 3, 'min: 20' );
+            gridTestUtils.expectFooterCellValueMatch( 'grid1', 4, 'max: 40' );
+            gridTestUtils.expectFooterCellValueMatch( 'grid1', 5, 'custom template' );
+            // gridTestUtils.expectFooterCellValueMatch( 'grid1', 6, 'max: ' + getMaxDateString() );
+            // TODO: need to check item count, not done
+          });
       });
     });
   </file>

test/e2e/gridTestUtils.spec.js

@@ -597,7 +597,7 @@ module.exports = {
   enterFilterInColumn: function( gridId, colNumber, filterValue ) {
     var headerCell = this.headerCell( gridId, colNumber);
 
-    headerCell.element( by.css( '.ui-grid-filter-input' ) ).sendKeys(filterValue);
+    return headerCell.element( by.css( '.ui-grid-filter-input' ) ).sendKeys(filterValue);
   },
 
   /**
@@ -694,7 +694,7 @@ module.exports = {
 
     gridMenuButton.element( by.repeater('item in menuItems').row( itemNumber) ).click();
   },
-  
+
   /**
   * @ngdoc method
   * @methodOf ui.grid.e2eTestLibrary.api:gridTest
@@ -713,5 +713,5 @@ module.exports = {
   unclickGridMenu: function( gridId ) {
     var gridMenuButton = this.getGrid( gridId ).element( by.css ( '.ui-grid-menu-button' ) );
     gridMenuButton.click();
-  }  
-};
+  }
+};