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

[pageObjects/dashboard] check that save is complete before resolving #21892

Merged
merged 1 commit into from
Aug 13, 2018
Merged

[pageObjects/dashboard] check that save is complete before resolving #21892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions test/functional/apps/dashboard/_dashboard_time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ export default function ({ getPageObjects, getService }) {
it('is saved', async () => {
await PageObjects.dashboard.clickNewDashboard();
await PageObjects.dashboard.addVisualizations([PageObjects.dashboard.getTestVisualizationNames()[0]]);
const isDashboardSaved = await PageObjects.dashboard.saveDashboard(dashboardName, { storeTimeWithDashboard: false });
expect(isDashboardSaved).to.eql(true);
await PageObjects.dashboard.saveDashboard(dashboardName, { storeTimeWithDashboard: false });
});

it('Does not set the time picker on open', async () => {
Expand All @@ -62,8 +61,7 @@ export default function ({ getPageObjects, getService }) {
it('is saved with quick time', async function () {
await PageObjects.dashboard.clickEdit();
await PageObjects.header.setQuickTime('Today');
const isDashboardSaved = await PageObjects.dashboard.saveDashboard(dashboardName, { storeTimeWithDashboard: true });
expect(isDashboardSaved).to.eql(true);
await PageObjects.dashboard.saveDashboard(dashboardName, { storeTimeWithDashboard: true });
});

it('sets quick time on open', async function () {
Expand All @@ -78,8 +76,7 @@ export default function ({ getPageObjects, getService }) {
it('is saved with absolute time', async function () {
await PageObjects.dashboard.clickEdit();
await PageObjects.header.setAbsoluteRange(fromTime, toTime);
const isDashboardSaved = await PageObjects.dashboard.saveDashboard(dashboardName, { storeTimeWithDashboard: true });
expect(isDashboardSaved).to.eql(true);
await PageObjects.dashboard.saveDashboard(dashboardName, { storeTimeWithDashboard: true });
});

it('sets absolute time on open', async function () {
Expand Down
19 changes: 17 additions & 2 deletions test/functional/page_objects/dashboard_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
}

/**
* Save the current dashboard with the specified name and options and
* verify that the save was successful
*
* @param dashName {String}
* @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, needsConfirm: false}}
Expand All @@ -301,8 +303,21 @@ export function DashboardPageProvider({ getService, getPageObjects }) {

await PageObjects.header.waitUntilLoadingHasFinished();

// Confirm that the Dashboard has been saved.
return await testSubjects.exists('saveDashboardSuccess');
// Confirm that the Dashboard has actually been saved
if (!await testSubjects.exists('saveDashboardSuccess')) {
throw new Error('Expected to find "saveDashboardSuccess" toast after saving dashboard');
}

await this.waitForSaveModalToClose();
}

async waitForSaveModalToClose() {
log.debug('Waiting for dashboard save modal to close');
await retry.try(async () => {
if (await testSubjects.exists('dashboardSaveModal')) {
throw new Error('dashboard save still open');
}
});
}

async deleteDashboard(dashboardName, dashboardId) {
Expand Down