diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 36dfecfaf..1cab6d61e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -95,7 +95,7 @@ jobs: e2es: needs: [lint, build, unit-tests] - name: 'E2e test suites: ${{ matrix.e2e-suites.name }}' + name: 'E2E Protractor - ${{ matrix.e2e-suites.name }}' runs-on: ubuntu-latest strategy: fail-fast: false @@ -139,7 +139,7 @@ jobs: e2es-playwright: needs: [lint, build, unit-tests] - name: 'E2e test suites: Playwright' + name: 'E2E Playwright - ${{ matrix.e2e-suites.name }}' runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts b/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts index c73b21392..073fcab98 100644 --- a/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts +++ b/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts @@ -23,6 +23,7 @@ */ import { ApiClientFactory, getUserState, test, Utils } from '@alfresco/playwright-shared'; +import { expect } from '@playwright/test'; test.use({ storageState: getUserState('hruser') }); test.describe('Rules - Manage Rules', () => { @@ -47,8 +48,9 @@ test.describe('Rules - Manage Rules', () => { await apiClientFactory.nodes.deleteNode(folderId, { permanent: true }); }); - test('[C691651] Disable an existing rule', async ({ personalFiles, nodesPage }) => { + test('[C691642] Create a rule and disable it', async ({ personalFiles, nodesPage }) => { await personalFiles.dataTable.performActionFromExpandableMenu(randomName, 'Manage rules'); - await nodesPage.manageRules.disableRuleToggle.click(); + await nodesPage.manageRules.ruleToggle.click(); + await expect(nodesPage.manageRules.ruleToggleFalse).toBeVisible(); }); }); diff --git a/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.e2e.ts b/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.e2e.ts index 5fc2823cf..d825a5cb9 100644 --- a/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.e2e.ts +++ b/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.e2e.ts @@ -102,6 +102,7 @@ test.describe('Folders - available actions : ', () => { await personalFiles.dataTable.selectMultiItem(testData.folderFavFile.name, testData.folderFile.name); await personalFiles.dataTable.getRowByName(testData.folderFavFile.name).click({ button: 'right' }); await personalFiles.matMenu.verifyActualMoreActions(testData.multipleSelFile.contextMenu); + await personalFiles.navigate({ remoteUrl: `#/personal-files/${parentId}` }); await personalFiles.dataTable.selectMultiItem(testData.folderFavFile.name, testData.folderFile.name); await checkMultipleSelActionsAvailable(personalFiles, testData.multipleSelFile.toolbarPrimary, testData.multipleSelFile.toolbarMore); }); diff --git a/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts index d8f154ede..6187a1180 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts @@ -29,7 +29,8 @@ export class ManageRules extends BaseComponent { private static rootElement = '.aca-manage-rules'; public getGroupsList = (optionName: string): Locator => this.getChild('.aca-rule-list-item__header', { hasText: optionName }); - public disableRuleToggle = this.getChild('.aca-manage-rules__container .mat-slide-toggle-bar').first(); + public ruleToggle = this.getChild('.aca-manage-rules__container .mat-slide-toggle-bar').first(); + public ruleToggleFalse = this.getChild('aca-rule-list-grouping input[type="checkbox"][aria-checked="false"]').first(); constructor(page: Page) { super(page, ManageRules.rootElement); diff --git a/projects/aca-playwright-shared/src/resources/test-files/index.ts b/projects/aca-playwright-shared/src/resources/test-files/index.ts index bddf38db1..8e217a4af 100644 --- a/projects/aca-playwright-shared/src/resources/test-files/index.ts +++ b/projects/aca-playwright-shared/src/resources/test-files/index.ts @@ -32,7 +32,7 @@ export const TEST_FILES = { }, DOCX2: { path: resolve(__dirname, 'file2-docx.docx'), - name: 'file-docx', + name: 'file2-docx', data: 'Lorem ipsum dolor sit amet' }, PDF: { @@ -58,7 +58,7 @@ export const TEST_FILES = { }, XLSX2: { path: resolve(__dirname, 'file2-xlsx.xlsx'), - name: 'file-xlsx', + name: 'file2-xlsx', data: 'Lorem ipsum dolor sit amet' }, JPG_FILE: {