Skip to content
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

TEST - Fix flaky map functional test #13039

Merged
merged 2 commits into from
Jul 21, 2017
Merged

TEST - Fix flaky map functional test #13039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
553705a
add time to toggleSpyTable to give time for tab to open and map to ad…
nreese Jul 21, 2017
bb499e7
make open and close spy panel functions that retry until panel is in …
nreese Jul 21, 2017
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
1 change: 1 addition & 0 deletions src/ui/public/visualize/spy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
class="kuiSelect"
ng-model="selectedModeName"
ng-change="onSpyModeChange()"
data-test-subj="spyModeSelect"
>
<option
ng-repeat="mode in modes.inOrder"
Expand Down
20 changes: 10 additions & 10 deletions test/functional/apps/visualize/_tile_map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function ({ getService, getPageObjects }) {
const screenshots = getService('screenshots');
const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings']);

describe('visualize app', function describeIndexTests() {
describe('tile map visualize app', function describeIndexTests() {
before(function () {
const fromTime = '2015-09-19 06:31:44.000';
const toTime = '2015-09-23 18:31:44.000';
Expand Down Expand Up @@ -98,7 +98,7 @@ export default function ({ getService, getPageObjects }) {
'f 187 { "lat": 45.656166475784175, "lon": -82.45831044201545 }',
'8 108 { "lat": 18.85260305600241, "lon": -156.5148810390383 }'];

return PageObjects.visualize.toggleSpyPanel()
return PageObjects.visualize.openSpyPanel()
.then(function () {
//level 1
return PageObjects.visualize.clickMapZoomOut();
Expand All @@ -114,7 +114,7 @@ export default function ({ getService, getPageObjects }) {
return PageObjects.visualize.getDataTableData()
.then(function showData(actualTableData) {
compareTableData(expectedTableData, actualTableData.trim().split('\n'));
return PageObjects.visualize.toggleSpyPanel();
return PageObjects.visualize.closeSpyPanel();
});
});
});
Expand Down Expand Up @@ -241,7 +241,7 @@ export default function ({ getService, getPageObjects }) {
return PageObjects.visualize.waitForToastMessageGone();
})
.then(function () {
return PageObjects.visualize.toggleSpyPanel();
return PageObjects.visualize.openSpyPanel();
})
// we're not selecting page size all, so we only have to verify the first page of data
.then(function getDataTableData() {
Expand All @@ -250,22 +250,22 @@ export default function ({ getService, getPageObjects }) {
})
.then(function showData(data) {
compareTableData(expectedTableData, data.trim().split('\n'));
return PageObjects.visualize.toggleSpyPanel();
return PageObjects.visualize.closeSpyPanel();
})
.then(function () {
// zoom to level 6, and make sure we go back to the saved level 5
return PageObjects.visualize.clickMapZoomIn();
})
.then(function () {
return PageObjects.visualize.toggleSpyPanel();
return PageObjects.visualize.openSpyPanel();
})
.then(function getDataTableData() {
log.debug('second get the zoom level 6 page data and verify it');
return PageObjects.visualize.getDataTableData();
})
.then(function showData(data) {
compareTableData(expectedTableDataZoomed, data.trim().split('\n'));
return PageObjects.visualize.toggleSpyPanel();
return PageObjects.visualize.closeSpyPanel();
})
.then(function () {
return PageObjects.visualize.loadSavedVisualization(vizName1);
Expand All @@ -278,15 +278,15 @@ export default function ({ getService, getPageObjects }) {
return PageObjects.common.sleep(4000);
})
.then(function () {
return PageObjects.visualize.toggleSpyPanel();
return PageObjects.visualize.openSpyPanel();
})
.then(function getDataTableData() {
log.debug('third get the zoom level 5 page data and verify it');
return PageObjects.visualize.getDataTableData();
})
.then(function showData(data) {
compareTableData(expectedTableData, data.trim().split('\n'));
return PageObjects.visualize.toggleSpyPanel();
return PageObjects.visualize.closeSpyPanel();
})
.then(function takeScreenshot() {
log.debug('Take screenshot');
Expand Down Expand Up @@ -331,7 +331,7 @@ export default function ({ getService, getPageObjects }) {

it('wms switch should change allow to zoom in further', function () {

return PageObjects.visualize.toggleSpyPanel()
return PageObjects.visualize.openSpyPanel()
.then(function () {
return PageObjects.visualize.clickOptions();
})
Expand Down
25 changes: 25 additions & 0 deletions test/functional/page_objects/visualize_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,31 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
return await testSubjects.exists('spyToggleButton');
}

async openSpyPanel() {
log.debug('openSpyPanel');
const isOpen = await testSubjects.exists('spyModeSelect');
if (!isOpen) {
await retry.try(async () => {
await this.toggleSpyPanel();
await testSubjects.find('spyModeSelect');
});
}
}

async closeSpyPanel() {
log.debug('closeSpyPanel');
let isOpen = await testSubjects.exists('spyModeSelect');
if (isOpen) {
await retry.try(async () => {
await this.toggleSpyPanel();
isOpen = await testSubjects.exists('spyModeSelect');
if (isOpen) {
throw new Error('Failed to close spy panel');
}
});
}
}

toggleSpyPanel() {
return testSubjects.click('spyToggleButton');
}
Expand Down