Skip to content

Commit

Permalink
LPD-17801 Fix flakiness, name consistently
Browse files Browse the repository at this point in the history
  • Loading branch information
markocikos authored and brianchandotcom committed Mar 8, 2024
1 parent ad0ef54 commit 9efb53b
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import getRandomString from '../../utils/getRandomString';
import getPageDefinition from '../layout-content-page-editor-web/utils/getPageDefinition';
import getWidgetDefinition from '../layout-content-page-editor-web/utils/getWidgetDefinition';
import {clientExtensionsPageTest} from './fixtures/clientExtensionsPageTest';
import {editorSamplePageTest} from './fixtures/editorSamplePageTest';
import {editorSamplesPageTest} from './fixtures/editorSamplesPageTest';
import {newEditorConfigContributorPageTest} from './fixtures/newEditorConfigContributorPageTest';

export const test = mergeTests(
apiHelpersTest,
clientExtensionsPageTest,
editorSamplePageTest,
editorSamplesPageTest,
featureFlagsTest({
'LPS-178052': true,
'LPS-186870': true,
Expand Down Expand Up @@ -103,7 +103,7 @@ test('Add a toolbar button to a CKEditor, by applying editor config contributor

test('Add a toolbar button to an Alloy Editor @LPD-11056', async ({
apiHelpers,
editorSamplePage,
editorSamplesPage,
page,
site,
}) => {
Expand All @@ -128,20 +128,26 @@ test('Add a toolbar button to an Alloy Editor @LPD-11056', async ({
`${liferayConfig.environment.baseUrl}/web${site.friendlyUrlPath}${layout.friendlyUrlPath}`
);

await editorSamplePage.selectTab({tabLabel: 'Alloy'});
await expect(
editorSamplesPage.balloonEditorContainer.getByText('Lorem ipsum')
).toBeInViewport();

await editorSamplePage.alloyEditorContainer.isVisible();
await editorSamplesPage.selectTab({tabLabel: 'Alloy'});

await expect(
editorSamplesPage.alloyEditorContainer.getByText('Lorem ipsum')
).toBeInViewport();
});

await test.step('Check if client extenstion is applied', async () => {
await editorSamplePage.alloyEditorContainer
await editorSamplesPage.alloyEditorContainer
.getByText('Lorem ipsum')
.selectText();

const toolbarContainer = editorSamplePage.alloyEditorToolbarContainer;

await toolbarContainer.isVisible();

expect(toolbarContainer.getByTitle('Insert Video')).toBeVisible();
await expect(
editorSamplesPage.alloyEditorToolbarContainer.getByTitle(
'Insert Video'
)
).toBeInViewport();
});
});

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* SPDX-FileCopyrightText: (c) 2000 Liferay, Inc. https://liferay.com
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

import {test} from '@playwright/test';

import {EditorSamplesPage} from '../pages/EditorSamplesPage';

const editorSamplesPageTest = test.extend<{
editorSamplesPage: EditorSamplesPage;
}>({
editorSamplesPage: async ({page}, use) => {
await use(new EditorSamplesPage(page));
},
});

export {editorSamplesPageTest};
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,20 @@

import {Locator, Page} from '@playwright/test';

export class EditorsSamplePage {
export class EditorSamplesPage {
readonly alloyEditorContainer: Locator;
readonly alloyEditorToolbarContainer: Locator;
readonly balloonEditorContainer: Locator;
readonly page: Page;

constructor(page: Page) {
this.alloyEditorContainer = page.locator('.alloy-editor-container');
this.alloyEditorContainer = page.locator('div[id$=sampleAlloyEditor]');
this.alloyEditorToolbarContainer = page.locator('.ae-toolbars');

this.balloonEditorContainer = page.locator(
'div[id$=sampleBalloonEditor]'
);

this.page = page;
}

Expand Down

0 comments on commit 9efb53b

Please sign in to comment.