Skip to content

Commit bb46112

Browse files
committed
Enables e2e test on 208
208 was disabled because the cancelFilterInColumn method wasn't working correctly however it seems to be working fine now.
1 parent aa97ecd commit bb46112

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

misc/tutorial/103_filtering.ngdoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,19 +235,19 @@ Refer {@link 321_singleFilter singleFilter tutorial}, it is possible to implemen
235235
});
236236

237237
it('cancel filter on gender column and on date column, should now see Bishop Carr in third row', function() {
238-
gridTestUtils.cancelFilterInColumnFor103( 'grid1', 1 )
238+
gridTestUtils.cancelFilterInColumn( 'grid1', 1 )
239239
.then(function () {
240-
return gridTestUtils.cancelFilterInColumnFor103( 'grid1', 6 );
240+
return gridTestUtils.cancelFilterInColumn( 'grid1', 6 );
241241
})
242242
.then(function () {
243243
gridTestUtils.expectCellValueMatch( 'grid1', 2, 0, 'Bishop Carr' );
244244
});
245245
});
246246

247247
it('filter on email column, should automatically do "ends with"', function() {
248-
gridTestUtils.cancelFilterInColumnFor103( 'grid1', 1 )
248+
gridTestUtils.cancelFilterInColumn( 'grid1', 1 )
249249
.then(function () {
250-
return gridTestUtils.cancelFilterInColumnFor103( 'grid1', 6 );
250+
return gridTestUtils.cancelFilterInColumn( 'grid1', 6 );
251251
})
252252
.then(function () {
253253
return gridTestUtils.enterFilterInColumn( 'grid1', 3, 'digirang.com' );

misc/tutorial/208_save_state.ngdoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ to something different, and use the restore button to set the grid back the way
122122
.then(function () {
123123
return gridTestUtils.cancelFilterInColumn( 'grid1', 1 );
124124
})
125-
/*
126125
.then(function () {
127126
gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Ethel Price' );
128127
})
@@ -147,8 +146,6 @@ to something different, and use the restore button to set the grid back the way
147146
gridTestUtils.expectHeaderColumnCount( 'grid1', 3 );
148147
gridTestUtils.expectCellValueMatch( 'grid1', 0, 0, 'Freda Mason' );
149148
});
150-
*/
151-
;
152149
});
153150

154151
});

test/e2e/gridTestUtils.spec.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -676,15 +676,6 @@ module.exports = {
676676
cancelFilterInColumn: function( gridId, colNumber ) {
677677
var headerCell = this.headerCell( gridId, colNumber);
678678

679-
// NOTE: Can't do .click() as it doesn't work when webdriving Firefox
680-
var cancelButton = headerCell.element( by.css( '.ui-grid-icon-cancel' ) ).element(by.xpath('..'));
681-
682-
return browser.actions().mouseMove(cancelButton).mouseDown(cancelButton).mouseUp().perform();
683-
},
684-
685-
cancelFilterInColumnFor103: function( gridId, colNumber ) {
686-
var headerCell = this.headerCell( gridId, colNumber);
687-
688679
// NOTE: Can't do .click() as it doesn't work when webdriving Firefox
689680
var cancelButton = headerCell.element( by.css( '.ui-grid-icon-cancel' ) );
690681

0 commit comments

Comments
 (0)