inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-2177] Actions - rearrange actions order (#922)

Browse Source 
* rearange actions

* remove separator duplication

* don't show last divider element

* update e2e

* update e2e

* Update toolbar-single-selection.test.ts

remove fdescribe

* move comment as well

* edit folder locator

* edit folder action

* edit folder action from toolbar more menu

* edit folder context menu id

* dont render versions tab
This commit is contained in:
Cilibiu Bogdan
2019-02-19 12:26:34 +02:00
committed by Adina Parpalita
parent 4cde12dfee
commit 2fd0ff3825
6 changed files with 199 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e2e/components/menu/menu.ts
View File

@@ -37,7 +37,7 @@ export class Menu extends Component {
submenu: 'app-context-menu-item .mat-menu-item',
editFolder: `app.context.menu.editFolder`,
editFolder: `.mat-menu-item[id$='editFolder']`,
editOffline: `.mat-menu-item[title='Edit offline']`,
cancelEditing: `.mat-menu-item[title='Cancel editing']`
};
@@ -54,7 +54,7 @@ export class Menu extends Component {
createLibraryAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Create Library'));
deleteAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Delete'));
downloadAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Download'));
editFolderAction: ElementFinder = this.component.element(by.id(Menu.selectors.editFolder));
editFolderAction: ElementFinder = this.component.element(by.css(Menu.selectors.editFolder));
editOfflineAction: ElementFinder = this.component.element(by.css(Menu.selectors.editOffline));
favoriteAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Favorite'));
joinAction: ElementFinder = this.component.element(by.cssContainingText(Menu.selectors.item, 'Join'));
@@ -196,6 +196,9 @@ export class Menu extends Component {
return this.uploadFiles;
}
async clickEditFolder() {
return await this.editFolderAction.click();
}
async clickShare() {
const action = this.shareAction;

36
e2e/suites/actions/edit-folder.test.ts
View File

@@ -111,7 +111,8 @@ describe('Edit folder', () => {
it('dialog UI defaults - [C216331]', async () => {
await dataTable.doubleClickOnRowByName(parent);
await dataTable.selectItem(folderName);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
expect(await editDialog.getTitle()).toEqual('Edit folder');
expect(await editDialog.getName()).toBe(folderName);
@@ -130,7 +131,8 @@ describe('Edit folder', () => {
it('properties are modified when pressing OK - [C216335]', async (done) => {
await dataTable.selectItem(folderNameToEdit);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.enterDescription(folderDescriptionEdited);
await editDialog.enterName(folderNameEdited);
@@ -146,7 +148,8 @@ describe('Edit folder', () => {
it('with empty folder name - [C216332]', async () => {
await dataTable.selectItem(folderName);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.deleteNameWithBackspace();
expect(await editDialog.isUpdateButtonEnabled()).toBe(false, 'upload button is not enabled');
@@ -157,7 +160,8 @@ describe('Edit folder', () => {
const namesWithSpecialChars = [ 'a*a', 'a"a', 'a<a', 'a>a', `a\\a`, 'a/a', 'a?a', 'a:a', 'a|a' ];
await dataTable.selectItem(folderName);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
for (const name of namesWithSpecialChars) {
await editDialog.enterName(name);
@@ -168,7 +172,8 @@ describe('Edit folder', () => {
it('with name ending with a dot - [C216334]', async () => {
await dataTable.selectItem(folderName);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.nameInput.sendKeys('.');
@@ -178,7 +183,8 @@ describe('Edit folder', () => {
it('Cancel button - [C216336]', async () => {
await dataTable.selectItem(folderName);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.clickCancel();
@@ -187,7 +193,8 @@ describe('Edit folder', () => {
it('with duplicate folder name - [C216337]', async () => {
await dataTable.selectItem(folderName);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.enterName(duplicateFolderName);
await editDialog.clickUpdate();
@@ -198,7 +205,8 @@ describe('Edit folder', () => {
it('trim ending spaces - [C216338]', async () => {
await dataTable.selectItem(folderName);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.nameInput.sendKeys(' ');
await editDialog.clickUpdate();
await editDialog.waitForDialogToClose();
@@ -216,7 +224,8 @@ describe('Edit folder', () => {
it('properties are modified when pressing OK - [C280384]', async (done) => {
await dataTable.selectItem(folderFavoriteToEdit);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.enterDescription(folderDescriptionEdited);
await editDialog.enterName(folderNameEdited);
@@ -232,7 +241,8 @@ describe('Edit folder', () => {
it('with duplicate folder name - [C280386]', async () => {
await dataTable.selectItem(folderFavorite);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.enterName(folderFavoriteDuplicate);
await editDialog.clickUpdate();
@@ -251,7 +261,8 @@ describe('Edit folder', () => {
it('properties are modified when pressing OK - [C280509]', async (done) => {
await dataTable.selectItem(folderSiteToEdit);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.enterDescription(folderDescriptionEdited);
await editDialog.enterName(folderNameEdited);
@@ -267,7 +278,8 @@ describe('Edit folder', () => {
it('with duplicate folder name - [C280511]', async () => {
await dataTable.selectItem(folderSite);
await toolbar.clickEditFolder();
await toolbar.openMoreMenu();
await toolbar.menu.clickEditFolder();
await editDialog.waitForDialogToOpen();
await editDialog.enterName(duplicateFolderSite);
await editDialog.clickUpdate();

4
e2e/suites/actions/special-permissions-available-actions.test.ts
View File

@@ -392,12 +392,12 @@ describe('Granular permissions available actions : ', () => {
expect(await toolbar.isViewPresent()).toBe(false, `View is not displayed for ${folder1}`);
expect(await toolbar.isDownloadPresent()).toBe(true, `Download is not displayed for ${folder1}`);
expect(await toolbar.isViewDetailsPresent()).toBe(true, `View details is not displayed for ${folder1}`);
// TODO: change expect to false when ACA-1737 is done
expect(await toolbar.isEditFolderPresent()).toBe(true, `Edit folder is displayed for ${folder1}`);
expect(await toolbar.isSharePresent()).toBe(false, `Share is displayed`);
await toolbar.openMoreMenu();
// TODO: change expect to false when ACA-1737 is done
expect(await toolbar.menu.isEditFolderPresent()).toBe(true, `Edit folder is displayed for ${folder1}`);
expect(await toolbar.menu.isEditOfflinePresent()).toBe(false, `Edit offline is displayed for ${folder1}`);
expect(await toolbar.menu.isCancelEditingPresent()).toBe(false, `Cancel editing is displayed for ${folder1}`);
expect(await toolbar.menu.isCopyPresent()).toBe(true, `Copy is not displayed for ${folder1}`);

8
e2e/suites/actions/toolbar-single-selection.test.ts
View File

@@ -182,10 +182,10 @@ describe('Toolbar actions - single selection : ', () => {
expect(await toolbar.isEmpty()).toBe(false, `actions not displayed for ${folderUser}`);
expect(await toolbar.isViewPresent()).toBe(false, `View is displayed for ${folderUser}`);
expect(await toolbar.isDownloadPresent()).toBe(true, `Download is not enabled for ${folderUser}`);
expect(await toolbar.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderUser}`);
await toolbar.openMoreMenu();
expect(await toolbar.menu.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderUser}`);
expect(await toolbar.menu.isEditOfflinePresent()).toBe(false, `Edit offline is displayed for ${folderUser}`);
expect(await toolbar.menu.isCancelEditingPresent()).toBe(false, `Cancel editing is displayed for ${folderUser}`);
expect(await toolbar.menu.isCopyPresent()).toBe(true, `Copy is not displayed for ${folderUser}`);
@@ -264,10 +264,10 @@ describe('Toolbar actions - single selection : ', () => {
expect(await toolbar.isEmpty()).toBe(false, `actions not displayed for ${folderInSite}`);
expect(await toolbar.isViewPresent()).toBe(false, `View is displayed for ${folderInSite}`);
expect(await toolbar.isDownloadPresent()).toBe(true, `Download is not enabled for ${folderInSite}`);
expect(await toolbar.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderInSite}`);
await toolbar.openMoreMenu();
expect(await toolbar.menu.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderInSite}`);
expect(await toolbar.menu.isEditOfflinePresent()).toBe(false, `Edit offline is displayed for ${folderInSite}`);
expect(await toolbar.menu.isCancelEditingPresent()).toBe(false, `Cancel editing is displayed for ${folderInSite}`);
expect(await toolbar.menu.isCopyPresent()).toBe(true, `Copy is not displayed for ${folderInSite}`);
@@ -599,10 +599,10 @@ describe('Toolbar actions - single selection : ', () => {
expect(await toolbar.isEmpty()).toBe(false, `actions not displayed for ${folderUser}`);
expect(await toolbar.isViewPresent()).toBe(false, `View is displayed for ${folderUser}`);
expect(await toolbar.isDownloadPresent()).toBe(true, `Download is not enabled for ${folderUser}`);
expect(await toolbar.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderUser}`);
await toolbar.openMoreMenu();
expect(await toolbar.menu.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderUser}`);
expect(await toolbar.menu.isEditOfflinePresent()).toBe(false, `Edit offline is displayed for ${folderUser}`);
expect(await toolbar.menu.isCancelEditingPresent()).toBe(false, `Cancel editing is displayed for ${folderUser}`);
expect(await toolbar.menu.isCopyPresent()).toBe(true, `Copy is not displayed for ${folderUser}`);
@@ -725,10 +725,10 @@ describe('Toolbar actions - single selection : ', () => {
expect(await toolbar.isEmpty()).toBe(false, `actions not displayed for ${folderUser}`);
expect(await toolbar.isViewPresent()).toBe(false, `View is displayed for ${folderUser}`);
expect(await toolbar.isDownloadPresent()).toBe(true, `Download is not enabled for ${folderUser}`);
expect(await toolbar.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderUser}`);
await toolbar.openMoreMenu();
expect(await toolbar.menu.isEditFolderPresent()).toBe(true, `Edit folder is not displayed for ${folderUser}`);
expect(await toolbar.menu.isEditOfflinePresent()).toBe(false, `Edit offline is displayed for ${folderUser}`);
expect(await toolbar.menu.isCancelEditingPresent()).toBe(false, `Cancel editing is displayed for ${folderUser}`);
expect(await toolbar.menu.isCopyPresent()).toBe(true, `Copy is not displayed for ${folderUser}`);