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

Jump to bottom

[Canvas] Fix flaky test failures when navigating to Canvas app #164376

Merged
merged 25 commits into from
Sep 19, 2023
Merged

[Canvas] Fix flaky test failures when navigating to Canvas app #164376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
70b2346
Remove current URL check when navigating to Canvas
cqliu1 Aug 21, 2023
270434b
Fix canvas page objects
cqliu1 Aug 21, 2023
cdb4a6e
Remove exclusive suite
cqliu1 Aug 21, 2023
053fd91
Throw when passing canvas to navigateToApp
cqliu1 Aug 22, 2023
aa355d6
Fix canvas page object
cqliu1 Aug 22, 2023
ae64c2a
Fix failing tests
cqliu1 Aug 22, 2023
47823dc
Fix tests
cqliu1 Aug 23, 2023
4cc34e0
Fix ts errors
cqliu1 Aug 31, 2023
37b931e
Merge branch 'main' of https://github.com/elastic/kibana into fix/nav…
cqliu1 Aug 31, 2023
93e8065
Fix canvas expression test
cqliu1 Aug 31, 2023
679f2d3
Fix canvas filters tests
cqliu1 Sep 1, 2023
206bf46
Fix page object
cqliu1 Sep 1, 2023
f2c78b2
Fix missing page object
cqliu1 Sep 1, 2023
bf7edbb
Merge branch 'main' into fix/navigate-to-canvas-flakiness
cqliu1 Sep 1, 2023
85ab931
Fix page object
cqliu1 Sep 1, 2023
647fe9b
Merge branch 'fix/navigate-to-canvas-flakiness' of https://github.com…
cqliu1 Sep 6, 2023
b38518e
Merge branch 'main' of https://github.com/elastic/kibana into fix/nav…
cqliu1 Sep 6, 2023
162eff9
Merge branch 'main' into fix/navigate-to-canvas-flakiness
cqliu1 Sep 7, 2023
ccc0074
Merge branch 'main' of https://github.com/elastic/kibana into fix/nav…
cqliu1 Sep 8, 2023
5ae931e
Merge branch 'main' of https://github.com/elastic/kibana into fix/nav…
cqliu1 Sep 18, 2023
86cbdd8
Merge branch 'fix/navigate-to-canvas-flakiness' of https://github.com…
cqliu1 Sep 18, 2023
21b910a
Filter workpads in loadFirstWorkpad
cqliu1 Sep 18, 2023
1e7dc0d
Fix save object resolve test
cqliu1 Sep 19, 2023
56e8be9
Remove exclusive suite
cqliu1 Sep 19, 2023
6a92a42
Fix typo
cqliu1 Sep 19, 2023
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
8 changes: 8 additions & 0 deletions test/functional/page_objects/common_page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,14 @@ export class CommonPageObject extends FtrService {
} = {}
) {
let appUrl: string;

// See https://github.com/elastic/kibana/pull/164376
if (appName === 'canvas' && !path) {
throw new Error(
'This causes flaky test failures. Use Canvas page object goToListingPage instead'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call!

);
}

if (this.config.has(['apps', appName])) {
// Legacy applications
const appConfig = this.config.get(['apps', appName]);
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/canvas/public/components/home/home.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export const Home = ({ activeTab = 'workpads' }: Props) => {
{
label: strings.getMyWorkpadsTabLabel(),
id: 'myWorkpads',
'data-test-subj': 'workpadListing',
isSelected: tab === 'workpads',
onClick: () => setTab('workpads'),
},
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/accessibility/apps/canvas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const esArchiver = getService('esArchiver');
const retry = getService('retry');
const { common } = getPageObjects(['common']);
const { canvas } = getPageObjects(['canvas']);

describe('Canvas Accessibility', () => {
before(async () => {
await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
await common.navigateToApp('canvas');
await canvas.goToListingPage();
});

it('loads workpads', async function () {
Expand Down
9 changes: 3 additions & 6 deletions x-pack/test/functional/apps/canvas/custom_elements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function canvasCustomElementTest({
const testSubjects = getService('testSubjects');
const browser = getService('browser');
const retry = getService('retry');
const PageObjects = getPageObjects(['canvas', 'common']);
const PageObjects = getPageObjects(['canvas']);
const find = getService('find');
const kibanaServer = getService('kibanaServer');
const archive = 'x-pack/test/functional/fixtures/kbn_archiver/canvas/default';
Expand All @@ -26,12 +26,9 @@ export default function canvasCustomElementTest({

before(async () => {
await kibanaServer.importExport.load(archive);
// open canvas home
await PageObjects.common.navigateToApp('canvas');
// load test workpad
await PageObjects.common.navigateToApp('canvas', {
hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31/page/1',
});
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.loadFirstWorkpad('Test Workpad');
});

after(async () => {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/apps/canvas/datasource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';

export default function canvasExpressionTest({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const PageObjects = getPageObjects(['canvas', 'common']);
const PageObjects = getPageObjects(['canvas']);
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const monacoEditor = getService('monacoEditor');
Expand All @@ -35,7 +35,7 @@ export default function canvasExpressionTest({ getService, getPageObjects }: Ftr
});

// create new test workpad
await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.createNewWorkpad();
});

Expand Down
9 changes: 4 additions & 5 deletions x-pack/test/functional/apps/canvas/embeddables/lens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { FtrProviderContext } from '../../../ftr_provider_context';

export default function canvasLensTest({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['canvas', 'common', 'header', 'lens']);
const PageObjects = getPageObjects(['canvas', 'header', 'lens']);
const esArchiver = getService('esArchiver');
const dashboardAddPanel = getService('dashboardAddPanel');
const dashboardPanelActions = getService('dashboardPanelActions');
Expand All @@ -25,7 +25,7 @@ export default function canvasLensTest({ getService, getPageObjects }: FtrProvid
await kibanaServer.savedObjects.cleanStandardList();
await kibanaServer.importExport.load(archives.kbn);
await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-lens' });
await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.createNewWorkpad();
});

Expand All @@ -49,9 +49,8 @@ export default function canvasLensTest({ getService, getPageObjects }: FtrProvid

it('renders lens visualization using savedLens expression', async () => {
// load test workpad
await PageObjects.common.navigateToApp('canvas', {
hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31/page/1',
});
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.loadFirstWorkpad('Test Workpad');
await PageObjects.header.waitUntilLoadingHasFinished();

await PageObjects.lens.assertLegacyMetric('Maximum of bytes', '16,788');
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/apps/canvas/embeddables/maps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';

export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['canvas', 'common', 'header', 'maps']);
const PageObjects = getPageObjects(['canvas', 'header', 'maps']);
const dashboardPanelActions = getService('dashboardPanelActions');
const dashboardAddPanel = getService('dashboardAddPanel');
const testSubjects = getService('testSubjects');
Expand All @@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async () => {
await kibanaServer.savedObjects.cleanStandardList();
// open canvas home
await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
// create new workpad
await PageObjects.canvas.createNewWorkpad();
await PageObjects.canvas.setWorkpadName('maps tests');
Expand Down
6 changes: 3 additions & 3 deletions x-pack/test/functional/apps/canvas/embeddables/saved_search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { FtrProviderContext } from '../../../ftr_provider_context';

export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['canvas', 'common', 'header', 'discover']);
const PageObjects = getPageObjects(['canvas', 'header', 'discover']);
const testSubjects = getService('testSubjects');
const kibanaServer = getService('kibanaServer');
const dashboardAddPanel = getService('dashboardAddPanel');
Expand All @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'test/functional/fixtures/kbn_archiver/dashboard/current/kibana'
);
// open canvas home
await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
// create new workpad
await PageObjects.canvas.createNewWorkpad();
await PageObjects.canvas.setWorkpadName('saved search tests');
Expand All @@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('edits saved search by-reference embeddable', async () => {
await dashboardPanelActions.editPanelByTitle('Rendering Test: saved search');
await PageObjects.discover.saveSearch('Rendering Test: saved search v2');
await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.loadFirstWorkpad('saved search tests');
await testSubjects.existOrFail('embeddablePanelHeading-RenderingTest:savedsearchv2');
});
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/apps/canvas/embeddables/visualization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';

export default function ({ getService, getPageObjects }: FtrProviderContext) {
const retry = getService('retry');
const PageObjects = getPageObjects(['canvas', 'common', 'header', 'visualize']);
const PageObjects = getPageObjects(['canvas', 'header', 'visualize']);
const kibanaServer = getService('kibanaServer');
const testSubjects = getService('testSubjects');
const dashboardAddPanel = getService('dashboardAddPanel');
Expand All @@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
);

// open canvas home
await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
// create new workpad
await PageObjects.canvas.createNewWorkpad();
await PageObjects.canvas.setWorkpadName('visualization tests');
Expand Down
7 changes: 3 additions & 4 deletions x-pack/test/functional/apps/canvas/expression.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function canvasExpressionTest({ getService, getPageObjects }: Ftr
const find = getService('find');
const kibanaServer = getService('kibanaServer');
const monacoEditor = getService('monacoEditor');
const PageObjects = getPageObjects(['canvas', 'common']);
const PageObjects = getPageObjects(['canvas']);
const retry = getService('retry');
const testSubjects = getService('testSubjects');

Expand All @@ -27,9 +27,8 @@ export default function canvasExpressionTest({ getService, getPageObjects }: Ftr
await kibanaServer.importExport.load(archive);

// load test workpad
await PageObjects.common.navigateToApp('canvas', {
hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31/page/1',
});
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.loadFirstWorkpad('Test Workpad');
});

after(async () => {
Expand Down
7 changes: 3 additions & 4 deletions x-pack/test/functional/apps/canvas/filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function canvasFiltersTest({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const retry = getService('retry');
const PageObjects = getPageObjects(['canvas', 'common']);
const PageObjects = getPageObjects(['canvas']);
const find = getService('find');
const kibanaServer = getService('kibanaServer');
const archive = 'x-pack/test/functional/fixtures/kbn_archiver/canvas/filter';
Expand All @@ -24,9 +24,8 @@ export default function canvasFiltersTest({ getService, getPageObjects }: FtrPro
before(async () => {
await kibanaServer.importExport.load(archive);
// load test workpad
await PageObjects.common.navigateToApp('canvas', {
hash: '/workpad/workpad-b5618217-56d2-47fa-b756-1be2306cda68/page/1',
});
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.loadFirstWorkpad('Filter Debug Workpad');
});

after(async () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/canvas/migrations_smoke_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import path from 'path';
import { FtrProviderContext } from '../../ftr_provider_context';

export default function ({ getPageObjects, getService }: FtrProviderContext) {
const PageObjects = getPageObjects(['common', 'settings', 'savedObjects']);
const PageObjects = getPageObjects(['settings', 'savedObjects']);

describe('migration smoke test', function () {
it('imports an 8.2 workpad', async function () {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/apps/canvas/reports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const security = getService('security');
const PageObjects = getPageObjects(['reporting', 'common', 'canvas']);
const PageObjects = getPageObjects(['reporting', 'canvas']);
const archive = 'x-pack/test/functional/fixtures/kbn_archiver/canvas/reports';

describe('Canvas PDF Report Generation', () => {
Expand Down Expand Up @@ -52,7 +52,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// Generating and then comparing reports can take longer than the default 60s timeout
this.timeout(180000);

await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.loadFirstWorkpad('The Very Cool Workpad for PDF Tests');

await PageObjects.reporting.openPdfReportingPanel();
Expand Down
24 changes: 16 additions & 8 deletions x-pack/test/functional/apps/canvas/saved_object_resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,14 @@ export default function canvasFiltersTest({ getService, getPageObjects }: FtrPro
});

it('redirects an alias match', async () => {
await PageObjects.common.navigateToApp('canvas', {
basePath: '/s/custom_space',
hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31-old-id/page/1',
});
await PageObjects.common.navigateToUrl(
'canvas',
'workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31-old-id/page/1',
{
basePath: '/s/custom_space',
shouldUseHashForSubUrl: false,
}
);

// Wait for the redirect toast
await retry.try(async () => {
Expand All @@ -111,10 +115,14 @@ export default function canvasFiltersTest({ getService, getPageObjects }: FtrPro
});

it('handles a conflict match', async () => {
await PageObjects.common.navigateToApp('canvas', {
basePath: '/s/custom_space',
hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31-conflict-old/page/1',
});
await PageObjects.common.navigateToUrl(
'canvas',
'workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31-conflict-old/page/1',
{
basePath: '/s/custom_space',
shouldUseHashForSubUrl: false,
}
);

await testSubjects.click('legacy-url-conflict-go-to-other-button');

Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/apps/canvas/smoke_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function canvasSmokeTest({ getService, getPageObjects }) {
const testSubjects = getService('testSubjects');
const browser = getService('browser');
const retry = getService('retry');
const PageObjects = getPageObjects(['common']);
const PageObjects = getPageObjects(['canvas']);
const kibanaServer = getService('kibanaServer');
const config = getService('config');
const archive = {
Expand All @@ -31,7 +31,7 @@ export default function canvasSmokeTest({ getService, getPageObjects }) {
await kibanaServer.importExport.load(archive.local);
}

await PageObjects.common.navigateToApp('canvas');
await PageObjects.canvas.goToListingPage();
});

after(async () => {
Expand Down
5 changes: 2 additions & 3 deletions x-pack/test/functional/apps/maps/group2/embeddable/canvas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {

describe('Map embeddable in canvas', () => {
before(async () => {
await PageObjects.common.navigateToApp('canvas', {
hash: '/workpad/workpad-c74f9c27-a142-4664-bf8a-69bf782fc268/page/1',
});
await PageObjects.canvas.goToListingPage();
await PageObjects.canvas.loadFirstWorkpad('Canvas with map');
});

it('should render map embeddable', async () => {
Expand Down
Loading
Loading