Merge pull request #3847 from angular-ui/fix/e2e-tests

Enables e2e test on 208

Author: JLLeitschuh

misc/tutorial/103_filtering.ngdoc

@@ -235,19 +235,19 @@ Refer {@link 321_singleFilter singleFilter tutorial}, it is possible to implemen
       });
 
       it('cancel filter on gender column and on date column, should now see Bishop Carr in third row', function() {
-        gridTestUtils.cancelFilterInColumnFor103( 'grid1', 1 )
+        gridTestUtils.cancelFilterInColumn( 'grid1', 1 )
           .then(function () {
-            return gridTestUtils.cancelFilterInColumnFor103( 'grid1', 6 );
+            return gridTestUtils.cancelFilterInColumn( 'grid1', 6 );
           })
           .then(function () {
             gridTestUtils.expectCellValueMatch( 'grid1', 2, 0, 'Bishop Carr' );
           });
       });
 
       it('filter on email column, should automatically do "ends with"', function() {
-        gridTestUtils.cancelFilterInColumnFor103( 'grid1', 1 )
+        gridTestUtils.cancelFilterInColumn( 'grid1', 1 )
           .then(function () {
-            return gridTestUtils.cancelFilterInColumnFor103( 'grid1', 6 );
+            return gridTestUtils.cancelFilterInColumn( 'grid1', 6 );
           })
           .then(function () {
             return gridTestUtils.enterFilterInColumn( 'grid1', 3, 'digirang.com' );

misc/tutorial/208_save_state.ngdoc

@@ -122,7 +122,6 @@ to something different, and use the restore button to set the grid back the way
           .then(function () {
             return gridTestUtils.cancelFilterInColumn( 'grid1', 1 );
           })
-          /*
           .then(function () {
             gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Ethel Price' );
           })
@@ -147,8 +146,6 @@ to something different, and use the restore button to set the grid back the way
             gridTestUtils.expectHeaderColumnCount( 'grid1', 3 );
             gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Freda Mason' );
           });
-          */
-          ;
       });
 
     });

test/e2e/gridTestUtils.spec.js

@@ -676,15 +676,6 @@ module.exports = {
   cancelFilterInColumn: function( gridId, colNumber ) {
     var headerCell = this.headerCell( gridId, colNumber);
 
-    // NOTE: Can't do .click() as it doesn't work when webdriving Firefox
-    var cancelButton = headerCell.element( by.css( '.ui-grid-icon-cancel' ) ).element(by.xpath('..'));
-
-    return browser.actions().mouseMove(cancelButton).mouseDown(cancelButton).mouseUp().perform();
-  },
-
-  cancelFilterInColumnFor103: function( gridId, colNumber ) {
-    var headerCell = this.headerCell( gridId, colNumber);
-
     // NOTE: Can't do .click() as it doesn't work when webdriving Firefox
     var cancelButton = headerCell.element( by.css( '.ui-grid-icon-cancel' ) );