Skip to content

Fix goToPage timing #7598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LeeDr merged 7 commits into from
Jul 7, 2016
Merged

Fix goToPage timing #7598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfe8563
Add getSpinnerDone after clicking a new page in index pattern field list
Jun 30, 2016
583c890
Add a debug log so we can tell what page we're going to if we fail
Jun 30, 2016
a8c1b4e
Try to fix another staleElementReference in data table test
Jul 1, 2016
7f5590a
Changes to fix settings page failure
Jul 6, 2016
39bcb7f
Merge branch 'master' into fixGoToPageTiming
Jul 6, 2016
2945d75
Fix a headerPage typo, un-nest some promises.
Jul 6, 2016
2953d84
change other headerPage to header
Jul 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions test/intern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ define(function (require) {
return Object.assign({
debug: true,
capabilities: {
'selenium-version': '2.53.0',
// must match URL in tasks/config/downloadSelenium.js
'idle-timeout': 99
},
environments: [{
Expand Down
56 changes: 25 additions & 31 deletions test/support/page_objects/settings_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,37 +239,30 @@ export default class SettingsPage {
goToPage(pageNum) {
return this.remote.setFindTimeout(defaultFindTimeout)
.findByCssSelector('ul.pagination-other-pages-list.pagination-sm.ng-scope li.ng-scope:nth-child(' +
(pageNum + 1) + ') a.ng-binding'
)
.then(page => {
return page.click();
(pageNum + 1) + ') a.ng-binding')
.click()
.then(function () {
return PageObjects.header.getSpinnerDone();
});
}

openControlsRow(row) {
return this.remote.setFindTimeout(defaultFindTimeout)
.findByCssSelector('table.table.table-condensed tbody tr:nth-child(' +
(row + 1) + ') td.ng-scope div.actions a.btn.btn-xs.btn-default i.fa.fa-pencil'
)
.then(page => {
return page.click();
});
(row + 1) + ') td.ng-scope div.actions a.btn.btn-xs.btn-default i.fa.fa-pencil')
.click();
}

openControlsByName(name) {
return this.remote.setFindTimeout(defaultFindTimeout)
.findByCssSelector('div.actions a.btn.btn-xs.btn-default[href$="/' + name + '"]')
.then(button => {
return button.click();
});
.click();
}

increasePopularity() {
return this.remote.setFindTimeout(defaultFindTimeout)
.findByCssSelector('button.btn.btn-default[aria-label="Plus"]')
.then(button => {
return button.click();
})
.click()
.then(() => {
return PageObjects.header.getSpinnerDone();
});
Expand All @@ -286,9 +279,7 @@ export default class SettingsPage {
controlChangeCancel() {
return this.remote.setFindTimeout(defaultFindTimeout)
.findByCssSelector('button.btn.btn-primary[aria-label="Cancel"]')
.then(button => {
return button.click();
})
.click()
.then(() => {
return PageObjects.header.getSpinnerDone();
});
Expand All @@ -297,9 +288,7 @@ export default class SettingsPage {
controlChangeSave() {
return this.remote.setFindTimeout(defaultFindTimeout)
.findByCssSelector('button.btn.btn-success.ng-binding[aria-label="Update Field"]')
.then(button => {
return button.click();
})
.click()
.then(() => {
return PageObjects.header.getSpinnerDone();
});
Expand All @@ -308,9 +297,7 @@ export default class SettingsPage {
setPageSize(size) {
return this.remote.setFindTimeout(defaultFindTimeout)
.findByCssSelector('form.form-inline.pagination-size.ng-scope.ng-pristine.ng-valid div.form-group option[label="' + size + '"]')
.then(button => {
return button.click();
})
.click()
.then(() => {
return PageObjects.header.getSpinnerDone();
});
Expand Down Expand Up @@ -352,14 +339,21 @@ export default class SettingsPage {
var alertText;

return PageObjects.common.try(() => {
return this.clickDeletePattern()
.then(() => {
PageObjects.common.debug('click delete index pattern button');
return this.clickDeletePattern();
})
.then(() => {
return PageObjects.common.try(() => {
PageObjects.common.debug('getAlertText');
return this.remote.getAlertText();
})
.then(function (text) {
alertText = text;
})
.then(() => {
});
})
.then(function (text) {
alertText = text;
})
.then(() => {
return PageObjects.common.try(() => {
PageObjects.common.debug('acceptAlert');
return this.remote.acceptAlert();
});
})
Expand Down
8 changes: 7 additions & 1 deletion test/support/page_objects/visualize_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,10 @@ export default class VisualizePage {
return this.remote
.setFindTimeout(defaultFindTimeout)
.findByCssSelector('.btn-success')
.click();
.click()
.then(function () {
return PageObjects.header.getSpinnerDone();
});
}


Expand Down Expand Up @@ -313,6 +316,9 @@ export default class VisualizePage {
.findByCssSelector('.config button[type="submit"]')
.click();
})
.then(function () {
return PageObjects.header.getSpinnerDone();
})
// verify that green message at the top of the page.
// it's only there for about 5 seconds
.then(() => {
Expand Down