diff --git a/e2e/playwright/upload-download-actions/src/tests/version-actions.e2e.ts b/e2e/playwright/upload-download-actions/src/tests/version-actions.e2e.ts new file mode 100644 index 0000000000..9e2a600572 --- /dev/null +++ b/e2e/playwright/upload-download-actions/src/tests/version-actions.e2e.ts @@ -0,0 +1,208 @@ +/*! + * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. + * + * Alfresco Example Content Application + * + * This file is part of the Alfresco Example Content Application. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * The Alfresco Example Content Application is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * The Alfresco Example Content Application is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * from Hyland Software. If not, see . + */ + +import { expect } from '@playwright/test'; +import { + ApiClientFactory, + Utils, + test, + TrashcanApi, + NodesApi, + TEST_FILES, + FileActionsApi, + SharedLinksApi, + FavoritesPageApi, + RecentFilesPage, + PersonalFilesPage, + FavoritesPage, + SharedPage, + SearchPage +} from '@alfresco/playwright-shared'; + +test.describe('Version actions', () => { + let trashcanApi: TrashcanApi; + let nodesApi: NodesApi; + let fileActionsApi: FileActionsApi; + let sharedLinksApi: SharedLinksApi; + let favoritesApi: FavoritesPageApi; + const random = Utils.random(); + const filesToUpload = [TEST_FILES.PDF, TEST_FILES.DOCX]; + const filenameBeforeUpdate = `${filesToUpload[0].name}-${random}`; + const filenameAfterUpdate = `${filesToUpload[1].name}-${random}`; + const username = `user-${random}`; + const parentFolder = `parent-${random}`; + let parentFolderId: string; + let fileId: string; + + async function viewFirstFileVersion(page: PersonalFilesPage | RecentFilesPage | FavoritesPage | SharedPage | SearchPage) { + await page.dataTable.selectItem(filenameAfterUpdate); + await page.acaHeader.clickMoreActions(); + await page.matMenu.clickMenuItem('Manage Versions'); + await page.manageVersionsDialog.viewFileVersion('1.0'); + await page.matMenu.clickMenuItem('View'); + } + + test.beforeAll(async () => { + try { + const apiClientFactory = new ApiClientFactory(); + await apiClientFactory.setUpAcaBackend('admin'); + await apiClientFactory.createUser({ username }); + trashcanApi = await TrashcanApi.initialize(username, username); + nodesApi = await NodesApi.initialize(username, username); + fileActionsApi = await FileActionsApi.initialize(username, username); + favoritesApi = await FavoritesPageApi.initialize(username, username); + sharedLinksApi = await SharedLinksApi.initialize(username, username); + + parentFolderId = (await nodesApi.createFolder(parentFolder)).entry.id; + fileId = (await fileActionsApi.uploadFile(filesToUpload[0].path, filenameBeforeUpdate, parentFolderId)).entry.id; + + await fileActionsApi.updateNodeContent(fileId, filesToUpload[1].path, true, 'new major version description', filenameAfterUpdate); + + await favoritesApi.addFavoritesByIds('file', [fileId]); + await favoritesApi.waitForApi(username, { expect: 1 }); + await sharedLinksApi.shareFilesByIds([fileId]); + await sharedLinksApi.waitForFilesToBeShared([fileId]); + } catch (error) { + console.error(`beforeAll failed: ${error}`); + } + }); + + test.afterAll(async () => { + await Utils.deleteNodesSitesEmptyTrashcan(nodesApi, trashcanApi, 'afterAll failed'); + }); + + test.describe('on Personal Files', () => { + test.beforeEach(async ({ loginPage, personalFiles }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); + await personalFiles.navigate(); + await personalFiles.dataTable.performClickFolderOrFileToOpen(parentFolder); + await personalFiles.dataTable.progressBarWaitForReload(); + await viewFirstFileVersion(personalFiles); + }); + + test('[C586766] Should be possible to view a previous document version', async ({ personalFiles }) => { + expect(personalFiles.page.url()).toContain('1.0'); + }); + + test('[C586767] Previous document version title should be the same in Preview mode as the Uploaded File', async ({ personalFiles }) => { + await personalFiles.viewer.waitForViewerToOpen('wait for viewer content'); + expect(await personalFiles.viewer.getFileTitle()).toContain(filenameBeforeUpdate); + }); + + test('[C586768] Should be possible to download a previous document version', async ({ personalFiles }) => { + const [download] = await Promise.all([personalFiles.page.waitForEvent('download'), await personalFiles.viewer.downloadButton.click()]); + expect(download.suggestedFilename()).toBe(filenameBeforeUpdate); + }); + }); + + test.describe('on Recent Files', () => { + test.beforeEach(async ({ loginPage, recentFilesPage }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); + await recentFilesPage.navigate(); + await viewFirstFileVersion(recentFilesPage); + }); + + test('[C586769] Should be possible to view a previous document version', async ({ recentFilesPage }) => { + expect(recentFilesPage.page.url()).toContain('1.0'); + }); + + test('[C586770] Previous document version title should be the same in Preview mode as the Uploaded File', async ({ recentFilesPage }) => { + await recentFilesPage.viewer.waitForViewerToOpen('wait for viewer content'); + expect(await recentFilesPage.viewer.getFileTitle()).toContain(filenameBeforeUpdate); + }); + + test('[C586771] Should be possible to download a previous document version', async ({ recentFilesPage }) => { + const [download] = await Promise.all([recentFilesPage.page.waitForEvent('download'), await recentFilesPage.viewer.downloadButton.click()]); + expect(download.suggestedFilename()).toBe(filenameBeforeUpdate); + }); + }); + + test.describe('on Favorites', () => { + test.beforeEach(async ({ loginPage, favoritePage }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); + await favoritePage.navigate(); + await viewFirstFileVersion(favoritePage); + }); + + test('[C586772] Should be possible to view a previous document version', async ({ favoritePage }) => { + expect(favoritePage.page.url()).toContain('1.0'); + }); + + test('[C586773] Previous document version title should be the same in Preview mode as the Uploaded File', async ({ favoritePage }) => { + await favoritePage.viewer.waitForViewerToOpen('wait for viewer content'); + expect(await favoritePage.viewer.getFileTitle()).toContain(filenameBeforeUpdate); + }); + + test('[C586774] Should be possible to download a previous document version', async ({ favoritePage }) => { + const [download] = await Promise.all([favoritePage.page.waitForEvent('download'), await favoritePage.viewer.downloadButton.click()]); + expect(download.suggestedFilename()).toBe(filenameBeforeUpdate); + }); + }); + + test.describe('on Shared Files', () => { + test.beforeEach(async ({ loginPage, sharedPage }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); + await sharedPage.navigate(); + await viewFirstFileVersion(sharedPage); + }); + + test('[C586776] Should be possible to view a previous document version', async ({ sharedPage }) => { + expect(sharedPage.page.url()).toContain('1.0'); + }); + + test('[C586777] Previous document version title should be the same in Preview mode as the Uploaded File', async ({ sharedPage }) => { + await sharedPage.viewer.waitForViewerToOpen('wait for viewer content'); + expect(await sharedPage.viewer.getFileTitle()).toContain(filenameBeforeUpdate); + }); + + test('[C586778] Should be possible to download a previous document version', async ({ sharedPage }) => { + const [download] = await Promise.all([sharedPage.page.waitForEvent('download'), await sharedPage.viewer.downloadButton.click()]); + expect(download.suggestedFilename()).toBe(filenameBeforeUpdate); + }); + }); + + test.describe('on Search', () => { + test.beforeEach(async ({ loginPage, searchPage }) => { + await Utils.tryLoginUser(loginPage, username, username, 'beforeEach failed'); + await searchPage.navigate(); + await searchPage.searchInput.searchButton.click(); + await searchPage.searchOverlay.searchFor(filenameAfterUpdate); + await viewFirstFileVersion(searchPage); + }); + + test('[C586779] Should be possible to view a previous document version', async ({ searchPage }) => { + expect(searchPage.page.url()).toContain('1.0'); + }); + + test('[C586780] Previous document version title should be the same in Preview mode as the Uploaded File', async ({ searchPage }) => { + await searchPage.viewer.waitForViewerToOpen('wait for viewer content'); + expect(await searchPage.viewer.getFileTitle()).toContain(filenameBeforeUpdate); + }); + + test('[C586781] Should be possible to download a previous document version', async ({ searchPage }) => { + const [download] = await Promise.all([searchPage.page.waitForEvent('download'), await searchPage.viewer.downloadButton.click()]); + expect(download.suggestedFilename()).toBe(filenameBeforeUpdate); + }); + }); +}); diff --git a/e2e/protractor/suites/actions/upload-download/download.test.ts b/e2e/protractor/suites/actions/upload-download/download.test.ts deleted file mode 100755 index a1b99c54dd..0000000000 --- a/e2e/protractor/suites/actions/upload-download/download.test.ts +++ /dev/null @@ -1,165 +0,0 @@ -/*! - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Alfresco Example Content Application - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * from Hyland Software. If not, see . - */ - -import { AdminActions, UserActions, LoginPage, BrowsingPage, RepoClient, Utils, click } from '@alfresco/aca-testing-shared'; - -describe('Download', () => { - const random = Utils.random(); - const username = `user-${random}`; - - const parent = `parent-${random}`; - let parentId: string; - - const filePersonal = `filePersonal-${random}.txt`; - const fileRecent1 = `fileRecent1-${random}.txt`; - const fileRecent2 = `fileRecent2-${random}.txt`; - const fileShared1 = `fileShared1-${random}.txt`; - const fileShared2 = `fileShared2-${random}.txt`; - const fileFavorites = `fileFavorites-${random}.txt`; - const fileSearch = `fileSearch-${random}.txt`; - - const folderPersonal = `folderPersonal-${random}`; - const folderFavorites = `folderFavorites-${random}`; - const folderSearch = `folderSearch-${random}`; - - const fileInFolderPersonal = `fileInFolderPersonal-${random}.txt`; - const fileInFolderFavorites = `fileInFolderFavorites-${random}.txt`; - const fileInFolderSearch = `fileInFolderSearch-${random}.txt`; - - const unzippedPersonal = `unzippedPersonal-${random}`; - - let fileShared1Id: string; - let fileShared2Id: string; - let fileFavoritesId: string; - let folderPersonalId: string; - let folderFavoritesId: string; - let folderSearchId: string; - - const archiveZip = 'archive.zip'; - - const apis = { - user: new RepoClient(username, username) - }; - - const loginPage = new LoginPage(); - const page = new BrowsingPage(); - const { dataTable, toolbar } = page; - - let initialFavoritesTotalItems: number; - let initialRecentTotalItems: number; - - const adminApiActions = new AdminActions(); - const userActions = new UserActions(); - - beforeAll(async () => { - await adminApiActions.createUser({ username }); - - initialRecentTotalItems = await apis.user.search.getTotalItems(username); - - parentId = (await apis.user.nodes.createFolder(parent)).entry.id; - - await apis.user.nodes.createFile(filePersonal, parentId); - await apis.user.nodes.createFile(fileRecent1, parentId); - await apis.user.nodes.createFile(fileRecent2, parentId); - fileShared1Id = (await apis.user.nodes.createFile(fileShared1, parentId)).entry.id; - fileShared2Id = (await apis.user.nodes.createFile(fileShared2, parentId)).entry.id; - fileFavoritesId = (await apis.user.nodes.createFile(fileFavorites, parentId)).entry.id; - await apis.user.nodes.createFile(fileSearch, parentId); - - folderPersonalId = (await apis.user.nodes.createFolder(folderPersonal, parentId)).entry.id; - await apis.user.nodes.createFile(fileInFolderPersonal, folderPersonalId); - - folderFavoritesId = (await apis.user.nodes.createFolder(folderFavorites, parentId)).entry.id; - await apis.user.nodes.createFile(fileInFolderFavorites, folderFavoritesId); - - folderSearchId = (await apis.user.nodes.createFolder(folderSearch, parentId)).entry.id; - await apis.user.nodes.createFile(fileInFolderSearch, folderSearchId); - - await apis.user.search.waitForApi(username, { expect: initialRecentTotalItems + 10 }); - - await userActions.login(username, username); - await userActions.shareNodes([fileShared1Id, fileShared2Id]); - await apis.user.shared.waitForFilesToBeShared([fileShared1Id, fileShared2Id]); - - initialFavoritesTotalItems = await apis.user.favorites.getFavoritesTotalItems(); - await apis.user.favorites.addFavoriteById('file', fileFavoritesId); - await apis.user.favorites.addFavoriteById('folder', folderFavoritesId); - await apis.user.favorites.waitForApi({ expect: initialFavoritesTotalItems + 2 }); - - await loginPage.loginWith(username); - }); - - afterAll(async () => { - await userActions.login(username, username); - await apis.user.nodes.deleteNodeById(parentId); - await userActions.emptyTrashcan(); - }); - - afterEach(async () => { - await Utils.renameFile(archiveZip, `${random}.zip`); - }); - - describe('on Personal Files', () => { - beforeEach(async () => { - await page.clickPersonalFilesAndWait(); - await dataTable.doubleClickOnRowByName(parent); - }); - - it('[C213179] Download a file', async () => { - await dataTable.selectItem(filePersonal); - await click(toolbar.downloadButton); - - expect(await Utils.fileExistsOnOS(filePersonal)).toBe(true, 'File not found in download location'); - }); - - it('[C216352] Download a folder', async () => { - await dataTable.selectItem(folderPersonal); - await click(toolbar.downloadButton); - - const folderZip = `${folderPersonal}.zip`; - - expect(await Utils.fileExistsOnOS(folderZip)).toBe(true, 'File not found in download location'); - - await Utils.unzip(folderZip); - - expect(await Utils.fileExistsOnOS(fileInFolderPersonal, folderPersonal)); - }); - - it('[C216353] Download multiple items', async () => { - await dataTable.selectMultipleItems([filePersonal, folderPersonal]); - await click(toolbar.downloadButton); - - expect(await Utils.fileExistsOnOS(archiveZip)).toBe(true, 'File not found in download location'); - - await Utils.unzip(archiveZip, unzippedPersonal); - - expect(await Utils.fileExistsOnOS(filePersonal, unzippedPersonal)).toBe(true, `${filePersonal} not found in unzipped folder`); - expect(await Utils.fileExistsOnOS(folderPersonal, unzippedPersonal)).toBe(true, `${folderPersonal} not found in unzipped folder`); - expect(await Utils.fileExistsOnOS(fileInFolderPersonal, unzippedPersonal, folderPersonal)).toBe( - true, - `${fileInFolderPersonal} not found in unzipped folder in ${folderPersonal}` - ); - }); - }); -}); diff --git a/e2e/protractor/suites/actions/upload-download/version-actions.test.ts b/e2e/protractor/suites/actions/upload-download/version-actions.test.ts deleted file mode 100644 index 6cfe1bb323..0000000000 --- a/e2e/protractor/suites/actions/upload-download/version-actions.test.ts +++ /dev/null @@ -1,125 +0,0 @@ -/*! - * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Alfresco Example Content Application - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * from Hyland Software. If not, see . - */ - -import { - AdminActions, - LoginPage, - BrowsingPage, - FILES, - RepoClient, - Utils, - ManageVersionsDialog, - Viewer, - UserActions -} from '@alfresco/aca-testing-shared'; -import { browser } from 'protractor'; - -describe('Version actions', () => { - const random = Utils.random(); - - const username = `user-${random}`; - const parentFolder = `parent-${random}`; - let parentFolderId: string; - - let fileId: string; - - const filesToUpload = [FILES.pdfFile, FILES.docxFile, FILES.xlsxFile, FILES.jpgFile, FILES.docxFile2]; - - const apis = { - user: new RepoClient(username, username) - }; - - const loginPage = new LoginPage(); - const page = new BrowsingPage(); - const { dataTable, toolbar } = page; - const versionManagePage = new ManageVersionsDialog(); - const viewerPage = new Viewer(); - - const adminApiActions = new AdminActions(); - const userActions = new UserActions(); - - beforeAll(async () => { - try { - await adminApiActions.createUser({ username }); - await userActions.login(username, username); - - parentFolderId = (await apis.user.nodes.createFolder(parentFolder)).entry.id; - - fileId = (await apis.user.upload.uploadFile(filesToUpload[0], parentFolderId)).entry.id; - - await apis.user.shared.shareFilesByIds([fileId]); - await apis.user.favorites.addFavoritesByIds('file', [fileId]); - - for (let i = 0; i < filesToUpload.length - 1; i++) { - await apis.user.nodes.updateNodeContent( - fileId, - `${browser.params.e2eRootPath}/resources/test-files/${filesToUpload[i + 1]}`, - true, - 'new major version description', - filesToUpload[i + 1] - ); - } - - await apis.user.shared.waitForFilesToBeShared([fileId]); - - await loginPage.loginWith(username); - await dataTable.doubleClickOnRowByName(parentFolder); - await dataTable.waitForHeader(); - } catch {} - }); - - afterAll(async () => { - await apis.user.nodes.deleteNodeById(parentFolderId); - }); - - describe('on Personal Files', () => { - beforeEach(async () => { - await page.clickPersonalFilesAndWait(); - await dataTable.doubleClickOnRowByName(parentFolder); - await dataTable.waitForHeader(); - await dataTable.selectItem(filesToUpload[4]); - await toolbar.clickMoreActionsManageVersions(); - await versionManagePage.viewFileVersion('1.0'); - }); - - afterEach(async () => { - await page.closeOpenDialogs(); - await Utils.pressEscape(); - }); - - it('[C586766] Should be possible to view a previous document version', async () => { - expect(await browser.getCurrentUrl()).toContain('1.0'); - }); - - it('[C586767] Previous document version title should be the same in Preview mode as the Uploaded File', async () => { - expect(await viewerPage.getFileTitle()).toContain(filesToUpload[0]); - }); - - it('[C586768] Should be possible to download a previous document version', async () => { - await viewerPage.toolbar.viewerDownloadButton.click(); - - expect(await Utils.fileExistsOnOS(filesToUpload[0])).toBe(true, 'File not found in download location'); - }); - }); -}); diff --git a/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts b/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts index fe0860df33..ca42746bf3 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts @@ -31,4 +31,5 @@ export * from './create-from-template-dialog-component'; export * from './adf-confirm-dialog.component'; export * from './share-dialog.component'; export * from './upload-new-version-dialog.component'; +export * from './manage-versions-dialog.component'; export * from './upload-dialog.component'; diff --git a/projects/aca-playwright-shared/src/page-objects/components/dialogs/manage-versions-dialog.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dialogs/manage-versions-dialog.component.ts new file mode 100755 index 0000000000..4a647f9e3b --- /dev/null +++ b/projects/aca-playwright-shared/src/page-objects/components/dialogs/manage-versions-dialog.component.ts @@ -0,0 +1,39 @@ +/*! + * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved. + * + * Alfresco Example Content Application + * + * This file is part of the Alfresco Example Content Application. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * The Alfresco Example Content Application is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * The Alfresco Example Content Application is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ + +import { Page } from '@playwright/test'; +import { BaseComponent } from '../base.component'; + +export class ManageVersionsDialog extends BaseComponent { + private static rootElement = '.adf-new-version-uploader-dialog'; + + async viewFileVersion(version: string): Promise { + const versionActionsButton = this.page.locator(`[id="adf-version-list-action-menu-button-${version}"]`); + await versionActionsButton.click(); + } + + constructor(page: Page) { + super(page, ManageVersionsDialog.rootElement); + } +} diff --git a/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts b/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts index a86ad1d4d8..21b270c923 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts @@ -35,6 +35,7 @@ export class ViewerComponent extends BaseComponent { public fileTitleButtonLocator = this.getChild('.adf-viewer__file-title'); public pdfViewerContentPages = this.getChild('.adf-pdf-viewer__content .page'); public shareButton = this.getChild('button[id="share-action-button"]'); + public downloadButton = this.getChild('button[id="app.viewer.download"]'); public allButtons = this.getChild('button'); toolbar = new AcaHeader(this.page); @@ -48,8 +49,11 @@ export class ViewerComponent extends BaseComponent { return count > 0; } - async waitForViewerToOpen(): Promise { + async waitForViewerToOpen(waitForViewerContent?: 'wait for viewer content'): Promise { await this.viewerLocator.waitFor({ state: 'visible', timeout: timeouts.medium }); + if(waitForViewerContent) { + await this.spinnerWaitForReload(); + } } async isViewerOpened(): Promise { @@ -67,6 +71,11 @@ export class ViewerComponent extends BaseComponent { return await this.fileTitleButtonLocator.isVisible(); } + async getFileTitle(): Promise { + await this.fileTitleButtonLocator.waitFor({ state: 'visible', timeout: timeouts.normal }); + return this.fileTitleButtonLocator.textContent(); + } + async getCloseButtonTooltip(): Promise { await this.closeButtonLocator.waitFor({ state: 'visible', timeout: timeouts.normal }); return await this.closeButtonLocator.getAttribute('title'); diff --git a/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts index 88df0dc769..2d83766541 100644 --- a/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts +++ b/projects/aca-playwright-shared/src/page-objects/pages/favorites.page.ts @@ -26,7 +26,7 @@ import { Page } from '@playwright/test'; import { BasePage } from './base.page'; import { DataTableComponent, MatMenuComponent, ViewerComponent, SidenavComponent, PaginationComponent, Breadcrumb, AdfInfoDrawerComponent } from '../components'; import { AcaHeader } from '../components/aca-header.component'; -import { AdfFolderDialogComponent, ViewerOverlayDialogComponent } from '../components/dialogs'; +import { AdfFolderDialogComponent, ViewerOverlayDialogComponent, ManageVersionsDialog } from '../components/dialogs'; export class FavoritesPage extends BasePage { private static pageUrl = 'favorites'; @@ -45,6 +45,7 @@ export class FavoritesPage extends BasePage { public pagination = new PaginationComponent(this.page); public breadcrumb = new Breadcrumb(this.page); public infoDrawer = new AdfInfoDrawerComponent(this.page); + public manageVersionsDialog = new ManageVersionsDialog(this.page); async waitForPageLoad() { await this.page.waitForURL(`**/${FavoritesPage.pageUrl}`); diff --git a/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts index 1b8f8e0c36..92f2fd95d5 100644 --- a/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts +++ b/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts @@ -42,6 +42,7 @@ import { AdfConfirmDialogComponent, AdfInfoDrawerComponent, UploadNewVersionDialog, + ManageVersionsDialog, UploadDialog } from '../components'; @@ -69,6 +70,7 @@ export class PersonalFilesPage extends BasePage { public confirmDialog = new AdfConfirmDialogComponent(this.page); public infoDrawer = new AdfInfoDrawerComponent(this.page); public uploadNewVersionDialog = new UploadNewVersionDialog(this.page); + public manageVersionsDialog = new ManageVersionsDialog(this.page); public uploadDialog = new UploadDialog(this.page); async selectCreateFolder(): Promise { diff --git a/projects/aca-playwright-shared/src/page-objects/pages/recent-files.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/recent-files.page.ts index 0d128056fd..e3496efaaf 100644 --- a/projects/aca-playwright-shared/src/page-objects/pages/recent-files.page.ts +++ b/projects/aca-playwright-shared/src/page-objects/pages/recent-files.page.ts @@ -26,7 +26,7 @@ import { Page } from '@playwright/test'; import { BasePage } from './base.page'; import { DataTableComponent, MatMenuComponent, ViewerComponent, SidenavComponent, Breadcrumb, AdfInfoDrawerComponent } from '../components'; import { AcaHeader } from '../components/aca-header.component'; -import { AdfFolderDialogComponent, ContentNodeSelectorDialog } from '../components/dialogs'; +import { AdfFolderDialogComponent, ContentNodeSelectorDialog, ManageVersionsDialog } from '../components/dialogs'; export class RecentFilesPage extends BasePage { private static pageUrl = 'recent-files'; @@ -44,4 +44,5 @@ export class RecentFilesPage extends BasePage { public breadcrumb = new Breadcrumb(this.page); public infoDrawer = new AdfInfoDrawerComponent(this.page); public contentNodeSelector = new ContentNodeSelectorDialog(this.page); + public manageVersionsDialog = new ManageVersionsDialog(this.page); } diff --git a/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts index 30febe9049..b4d546ee24 100644 --- a/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts +++ b/projects/aca-playwright-shared/src/page-objects/pages/search.page.ts @@ -41,7 +41,7 @@ import { SearchFiltersProperties } from '../components'; import { AcaHeader } from '../components/aca-header.component'; -import { AdfConfirmDialogComponent, AdfFolderDialogComponent } from '../components/dialogs'; +import { AdfConfirmDialogComponent, AdfFolderDialogComponent, ManageVersionsDialog } from '../components/dialogs'; export type SearchType = 'files' | 'folders' | 'filesAndFolders' | 'libraries'; @@ -69,6 +69,7 @@ export class SearchPage extends BasePage { public searchFiltersLogic = new SearchFiltersLogic(this.page); public sidenav = new SidenavComponent(this.page); public confirmDialogComponent = new AdfConfirmDialogComponent(this.page); + public manageVersionsDialog = new ManageVersionsDialog(this.page); async searchWithin(searchText: string, searchType: SearchType): Promise { await this.acaHeader.searchButton.click(); diff --git a/projects/aca-playwright-shared/src/page-objects/pages/shared.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/shared.page.ts index f10edce011..a86fe3f46a 100644 --- a/projects/aca-playwright-shared/src/page-objects/pages/shared.page.ts +++ b/projects/aca-playwright-shared/src/page-objects/pages/shared.page.ts @@ -26,7 +26,7 @@ import { Page } from '@playwright/test'; import { BasePage } from './base.page'; import { DataTableComponent, MatMenuComponent, ViewerComponent, SidenavComponent, Breadcrumb, AdfInfoDrawerComponent } from '../components'; import { AcaHeader } from '../components/aca-header.component'; -import { AdfFolderDialogComponent, ViewerOverlayDialogComponent } from '../components/dialogs'; +import { AdfFolderDialogComponent, ViewerOverlayDialogComponent, ManageVersionsDialog } from '../components/dialogs'; export class SharedPage extends BasePage { private static pageUrl = 'shared'; @@ -44,5 +44,6 @@ export class SharedPage extends BasePage { public sidenav = new SidenavComponent(this.page); public breadcrumb = new Breadcrumb(this.page); public infoDrawer = new AdfInfoDrawerComponent(this.page); + public manageVersionsDialog = new ManageVersionsDialog(this.page); }