Skip to content

Commit

Permalink
[ACS-5018] library actions protractor tests (#3545)
Browse files Browse the repository at this point in the history
* [ACS-5018] library actions protractor tests

* updating type and timeout

* implementing reviews comments
  • Loading branch information
azakrzewski-hy authored Nov 29, 2023
1 parent 8831c2e commit 1b55de0
Show file tree
Hide file tree
Showing 12 changed files with 529 additions and 444 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,8 @@ jobs:
id: 7
- name: "editActions,favoriteActions"
id: 8
- name: "libraryActions"
id: 9
- name: "uploadDownloadActions"
id: 10
id: 9
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
442 changes: 442 additions & 0 deletions e2e/playwright/actions/src/tests/library/library-actions.spec.ts

Large diffs are not rendered by default.

429 changes: 0 additions & 429 deletions e2e/protractor/suites/actions/library/library-actions.test.ts

This file was deleted.

34 changes: 33 additions & 1 deletion projects/aca-playwright-shared/src/api/sites-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

import { ApiClientFactory } from './api-client-factory';
import { Site, SiteBodyCreate, SiteEntry, SiteMemberEntry, SiteMembershipBodyCreate, SiteMembershipBodyUpdate } from '@alfresco/js-api';
import { Site, SiteBodyCreate, SiteEntry, SiteMemberEntry, SiteMembershipBodyCreate, SiteMembershipBodyUpdate, SiteMembershipRequestBodyCreate, SiteMembershipRequestEntry } from '@alfresco/js-api';

export class SitesApi {
private apiService: ApiClientFactory;
Expand Down Expand Up @@ -109,4 +109,36 @@ export class SitesApi {
}
}
}

async createSiteMembershipRequestForPerson(personId: string, siteId: string): Promise<SiteMembershipRequestEntry> {
const body = {
id: siteId
} as SiteMembershipRequestBodyCreate;

try {
return await this.apiService.sites.createSiteMembershipRequestForPerson(personId, body);
} catch (error) {
console.error(`SitesApi createSiteMembershipRequestForPerson : catch : `, error);
return null;
}
}

async approveSiteMembershipRequest(siteId: string, inviteeId: string): Promise<SiteMemberEntry> {
try {
return await this.apiService.sites.approveSiteMembershipRequest(siteId, inviteeId);
} catch (error) {
console.error(`SitesApi approveSiteMembershipRequest : catch : `, error);
return null;
}
}

async hasMembershipRequest(personId: string, siteId: string): Promise<boolean> {
try {
const requests = (await this.apiService.sites.listSiteMembershipRequestsForPerson(personId)).list.entries.map((e) => e.entry.id);
return requests.includes(siteId);
} catch (error) {
console.error(`SitesApi hasMembershipRequest : catch : `, error);
return null;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ import {
LoginPage,
NodesApi,
SitesApi,
users
users,
FavoritesLibrariesPage
} from '../';

interface Pages {
Expand All @@ -51,6 +52,7 @@ interface Pages {
favoritePage: FavoritesPage;
trashPage: TrashPage;
loginPage: LoginPage;
favoriteLibrariesPage: FavoritesLibrariesPage;
}

interface Api {
Expand Down Expand Up @@ -109,4 +111,7 @@ export const test = base.extend<Pages & Api>({
myLibrariesPage: async ({ page }, use) => {
await use(new MyLibrariesPage(page));
},
favoriteLibrariesPage: async ({ page }, use) => {
await use(new FavoritesLibrariesPage(page));
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*!
* Copyright © 2005-2023 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 <http://www.gnu.org/licenses/>.
*/

import { Page } from '@playwright/test';
import { BaseComponent } from '../base.component';

export class AdfConfirmDialogComponent extends BaseComponent {
private static rootElement = 'adf-confirm-dialog';

constructor(page: Page) {
super(page, AdfConfirmDialogComponent.rootElement);
}

getDialogTitle = (text: string) => this.getChild('[data-automation-id="adf-confirm-dialog-title"]', { hasText: text });
getDialogContent = (text: string) => this.getChild('[data-automation-id="adf-confirm-dialog-base-message"]', { hasText: text });
okButton = this.getChild('[data-automation-id="adf-confirm-dialog-confirmation"]');
cancelButton = this.getChild('[data-automation-id="adf-confirm-dialog-reject"]');
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ export * from './password-overlay-dialog.component';
export * from './viewer-overlay-dialog.component';
export * from './content-node-selector-dialog';
export * from './create-from-template-dialog-component';
export * from './adf-confirm-dialog.component';
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { Page } from '@playwright/test';
import { BasePage } from './base.page';
import { DataTableComponent, MatMenuComponent, SidenavComponent, ViewerComponent } from '../components';
import { AcaHeader } from '../components/aca-header.component';
import { AdfFolderDialogComponent, ViewerOverlayDialogComponent } from '../components/dialogs';
import { AdfConfirmDialogComponent, AdfFolderDialogComponent, ViewerOverlayDialogComponent } from '../components/dialogs';

export class FavoritesLibrariesPage extends BasePage {
private static pageUrl = 'favorite/libraries';
Expand All @@ -42,4 +42,5 @@ export class FavoritesLibrariesPage extends BasePage {
public viewer = new ViewerComponent(this.page);
public viewerDialog = new ViewerOverlayDialogComponent(this.page);
public sidenav = new SidenavComponent(this.page);
public confirmDialogComponent = new AdfConfirmDialogComponent(this.page);
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import {
ContentNodeSelectorDialog,
Breadcrumb,
SidenavComponent,
CreateFromTemplateDialogComponent
CreateFromTemplateDialogComponent,
AdfConfirmDialogComponent
} from '../components';

export class MyLibrariesPage extends BasePage {
Expand All @@ -56,6 +57,7 @@ export class MyLibrariesPage extends BasePage {
public sidenav = new SidenavComponent(this.page);
public contentNodeSelector = new ContentNodeSelectorDialog(this.page);
public createFromTemplateDialogComponent = new CreateFromTemplateDialogComponent(this.page);
public confirmDialogComponent = new AdfConfirmDialogComponent(this.page);

async selectCreateLibrary(): Promise<void> {
await this.acaHeader.createButton.click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { Page } from '@playwright/test';
import { BasePage } from './base.page';
import { DataTableComponent, MatMenuComponent, ViewerComponent, SearchInputComponent, SearchOverlayComponent, SidenavComponent } from '../components';
import { AcaHeader } from '../components/aca-header.component';
import { AdfFolderDialogComponent } from '../components/dialogs';
import { AdfConfirmDialogComponent, AdfFolderDialogComponent } from '../components/dialogs';

export class SearchPage extends BasePage {
private static pageUrl = 'search';
Expand All @@ -43,4 +43,5 @@ export class SearchPage extends BasePage {
public searchInput = new SearchInputComponent(this.page);
public searchOverlay = new SearchOverlayComponent(this.page);
public sidenav = new SidenavComponent(this.page);
public confirmDialogComponent = new AdfConfirmDialogComponent(this.page);
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { GenericDialog } from '../dialog/generic-dialog';
import { isPresentAndEnabled } from '../../utilities/utils';

export class ConfirmDialog extends GenericDialog {
okButton = this.childElement(by.buttonText('OK'));
cancelButton = this.childElement(by.buttonText('Cancel'));
keepButton = this.childElement(by.buttonText('Keep'));
deleteButton = this.childElement(by.buttonText('Delete'));
Expand All @@ -41,10 +40,6 @@ export class ConfirmDialog extends GenericDialog {
return this.content.getText();
}

async isOkEnabled(): Promise<boolean> {
return isPresentAndEnabled(this.okButton);
}

async isCancelEnabled(): Promise<boolean> {
return isPresentAndEnabled(this.cancelButton);
}
Expand Down
2 changes: 0 additions & 2 deletions projects/aca-testing-shared/src/components/toolbar/toolbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ export class Toolbar extends Component {
downloadButton = element(By.css(`.mat-icon-button[title='Download']`));
viewDetailsButton = element(By.css(`button[title='View Details']`));
printButton = element(By.css(`button[title='Print']`));
joinButton = element(By.css(`button[title='Join']`));
leaveButton = element(By.css(`button[title='Leave Library']`));
permanentlyDeleteButton = element(By.css(`button[title='Permanently Delete']`));
restoreButton = element(By.css(`button[title='Restore']`));
searchIconButton = element(By.css(`button[title='Search']`));
Expand Down

0 comments on commit 1b55de0

Please sign in to comment.