From cfe85639fcb7c5295aa4aec80aca7b62460d1147 Mon Sep 17 00:00:00 2001 From: LeeDr Date: Thu, 30 Jun 2016 14:44:57 -0500 Subject: [PATCH 1/5] Add getSpinnerDone after clicking a new page in index pattern field list --- test/support/page_objects/settings_page.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/support/page_objects/settings_page.js b/test/support/page_objects/settings_page.js index e6beb1e9ff1e6..caabcc6607874 100644 --- a/test/support/page_objects/settings_page.js +++ b/test/support/page_objects/settings_page.js @@ -244,6 +244,9 @@ export default (function () { ) .then(function (page) { return page.click(); + }) + .then(function () { + return headerPage.getSpinnerDone(); }); }, From 583c89012c45a3610b41a36f2f46cedbdf79ed5c Mon Sep 17 00:00:00 2001 From: LeeDr Date: Thu, 30 Jun 2016 15:13:56 -0500 Subject: [PATCH 2/5] Add a debug log so we can tell what page we're going to if we fail --- test/support/page_objects/settings_page.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/support/page_objects/settings_page.js b/test/support/page_objects/settings_page.js index caabcc6607874..d27534df468f8 100644 --- a/test/support/page_objects/settings_page.js +++ b/test/support/page_objects/settings_page.js @@ -238,6 +238,7 @@ export default (function () { }, goToPage: function (pageNum) { + common.debug('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' From a8c1b4e8049cc22ba3dda9a79006bfb1a9455548 Mon Sep 17 00:00:00 2001 From: LeeDr Date: Fri, 1 Jul 2016 17:40:01 -0500 Subject: [PATCH 3/5] Try to fix another staleElementReference in data table test --- test/functional/apps/visualize/_data_table.js | 3 --- test/intern.js | 2 -- test/support/page_objects/visualize_page.js | 10 ++++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js index 302825c8cf51f..e2b08e8d7ffde 100644 --- a/test/functional/apps/visualize/_data_table.js +++ b/test/functional/apps/visualize/_data_table.js @@ -46,9 +46,6 @@ bdd.describe('visualize app', function describeIndexTests() { }) .then(function clickGo() { return visualizePage.clickGo(); - }) - .then(function () { - return headerPage.getSpinnerDone(); }); }); diff --git a/test/intern.js b/test/intern.js index f3ee839d7a0d1..095ae1cb8000f 100644 --- a/test/intern.js +++ b/test/intern.js @@ -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: [{ diff --git a/test/support/page_objects/visualize_page.js b/test/support/page_objects/visualize_page.js index 6a26edd4f19d4..4bde443b70063 100644 --- a/test/support/page_objects/visualize_page.js +++ b/test/support/page_objects/visualize_page.js @@ -1,4 +1,4 @@ -import { common, defaultFindTimeout, remote } from '../'; +import { common, defaultFindTimeout, remote, headerPage } from '../'; export default (function () { function VisualizePage() { @@ -280,7 +280,10 @@ export default (function () { return this.remote .setFindTimeout(defaultFindTimeout) .findByCssSelector('.btn-success') - .click(); + .click() + .then(function () { + return headerPage.getSpinnerDone(); + }); }, @@ -354,6 +357,9 @@ export default (function () { .setFindTimeout(defaultFindTimeout) .findByLinkText(vizName) .click(); + }) + .then(function () { + return headerPage.getSpinnerDone(); }); }, From 2945d75df6c056dfb33d3629a7aab672b3e6f1f8 Mon Sep 17 00:00:00 2001 From: LeeDr Date: Wed, 6 Jul 2016 16:44:44 -0500 Subject: [PATCH 4/5] Fix a headerPage typo, un-nest some promises. --- test/support/page_objects/settings_page.js | 39 ++++++++-------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/test/support/page_objects/settings_page.js b/test/support/page_objects/settings_page.js index f177d9f555a42..2b09a6e0a1e61 100644 --- a/test/support/page_objects/settings_page.js +++ b/test/support/page_objects/settings_page.js @@ -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(); }); }) From 2953d84c6f280ea403e04bc120443f9214e982b8 Mon Sep 17 00:00:00 2001 From: LeeDr Date: Wed, 6 Jul 2016 17:14:12 -0500 Subject: [PATCH 5/5] change other headerPage to header --- test/support/page_objects/visualize_page.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/support/page_objects/visualize_page.js b/test/support/page_objects/visualize_page.js index 294dfe54f2c07..22c0a91824b9b 100644 --- a/test/support/page_objects/visualize_page.js +++ b/test/support/page_objects/visualize_page.js @@ -280,7 +280,7 @@ export default class VisualizePage { .findByCssSelector('.btn-success') .click() .then(function () { - return PageObjects.headerPage.getSpinnerDone(); + return PageObjects.header.getSpinnerDone(); }); } @@ -317,7 +317,7 @@ export default class VisualizePage { .click(); }) .then(function () { - return PageObjects.headerPage.getSpinnerDone(); + return PageObjects.header.getSpinnerDone(); }) // verify that green message at the top of the page. // it's only there for about 5 seconds