Fix a headerPage typo, un-nest some promises.

This commit is contained in:
LeeDr 2016-07-06 16:44:44 -05:00
parent 39bcb7f073
commit 2945d75df6

View file

@ -239,40 +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.headerPage.getSpinnerDone();
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();
});
@ -289,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();
});
@ -300,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();
});
@ -311,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();
});
@ -355,10 +339,12 @@ export default class SettingsPage {
var alertText;
return PageObjects.common.try(() => {
PageObjects.common.debug('click delete index pattern button');
return this.clickDeletePattern();
})
.then(() => {
return PageObjects.common.try(() => {
PageObjects.common.debug('getAlertText');
return this.remote.getAlertText();
});
})
@ -367,6 +353,7 @@ export default class SettingsPage {
})
.then(() => {
return PageObjects.common.try(() => {
PageObjects.common.debug('acceptAlert');
return this.remote.acceptAlert();
});
})