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

restored changes and trying a fix for viewer

Browse Source
This commit is contained in:
SheenaMalhotra182
2023-06-21 12:21:04 +05:30
parent 9d72cad34b
commit 59eed680e9
10 changed files with 106 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e2e/protractor/suites/actions-available/files-folders/folders-actions.test.ts
View File

@@ -22,17 +22,7 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import {
RepoClient,
Utils,
AdminActions,
UserActions,
LoginPage,
SearchResultsPage,
BrowsingPage,
APP_ROUTES,
navigate
} from '@alfresco/aca-testing-shared';
import { RepoClient, Utils, AdminActions, UserActions, LoginPage, SearchResultsPage, BrowsingPage } from '@alfresco/aca-testing-shared';
import * as testData from './test-data';
import * as testUtil from '../test-util';
@@ -53,7 +43,7 @@ describe('Folders - available actions : ', () => {
const loginPage = new LoginPage();
const page = new BrowsingPage();
const { dataTable } = page;
const { dataTable, toolbar } = page;
const { searchInput } = page.pageLayoutHeader;
const searchResultsPage = new SearchResultsPage();
@@ -160,7 +150,7 @@ describe('Folders - available actions : ', () => {
describe('on a folder', () => {
beforeAll(async () => {
await page.clickPersonalFiles();
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(random);
await searchResultsPage.waitForResults();
@@ -180,7 +170,7 @@ describe('Folders - available actions : ', () => {
describe('on multiple selection', () => {
it('[C291821] multiple folders', async () => {
await page.clickPersonalFiles();
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(random);
await searchResultsPage.waitForResults();
@@ -195,7 +185,7 @@ describe('Folders - available actions : ', () => {
it('[C291822] both files and folders', async () => {
await page.clickPersonalFiles();
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(`${testData.file.name} or ${testData.folderFav.name}`);
await searchResultsPage.waitForResults();

4
e2e/protractor/suites/actions-available/files-folders/generic.test.ts
View File

@@ -22,7 +22,7 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import { RepoClient, Utils, AdminActions, LoginPage, BrowsingPage, APP_ROUTES, navigate, NodeContentTree } from '@alfresco/aca-testing-shared';
import { LoginPage, BrowsingPage, RepoClient, NodeContentTree, Utils, AdminActions } from '@alfresco/aca-testing-shared';
import { BrowserActions } from '@alfresco/adf-testing';
describe('Generic tests : ', () => {
@@ -114,7 +114,7 @@ describe('Generic tests : ', () => {
describe('Actions are not displayed when no item is selected', () => {
it('[C291815] on Search Results', async () => {
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor('*');

16
e2e/protractor/suites/actions-available/files-folders/locked-files-actions.test.ts
View File

@@ -22,17 +22,7 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import {
RepoClient,
Utils,
AdminActions,
UserActions,
LoginPage,
SearchResultsPage,
BrowsingPage,
APP_ROUTES,
navigate
} from '@alfresco/aca-testing-shared';
import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
import * as testData from './test-data';
import * as testUtil from '../test-util';
@@ -54,7 +44,7 @@ describe('Locked Files - available actions : ', () => {
const loginPage = new LoginPage();
const page = new BrowsingPage();
const { dataTable } = page;
const { dataTable, toolbar } = page;
const { searchInput } = page.pageLayoutHeader;
const searchResultsPage = new SearchResultsPage();
@@ -274,7 +264,7 @@ describe('Locked Files - available actions : ', () => {
describe('on Search Results : ', () => {
beforeEach(async () => {
await page.clickPersonalFiles();
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles();
await searchInput.searchFor(random);

16
e2e/protractor/suites/actions-available/files-folders/multiple-files-actions.test.ts
View File

@@ -22,17 +22,7 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import {
RepoClient,
Utils,
AdminActions,
UserActions,
LoginPage,
SearchResultsPage,
BrowsingPage,
APP_ROUTES,
navigate
} from '@alfresco/aca-testing-shared';
import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
import * as testData from './test-data';
import * as testUtil from '../test-util';
@@ -61,7 +51,7 @@ describe('Multiple Files - available actions : ', () => {
const loginPage = new LoginPage();
const page = new BrowsingPage();
const { dataTable } = page;
const { dataTable, toolbar } = page;
const { searchInput } = page.pageLayoutHeader;
const searchResultsPage = new SearchResultsPage();
@@ -171,7 +161,7 @@ describe('Multiple Files - available actions : ', () => {
describe('on Search Results : ', () => {
beforeEach(async () => {
await page.clickPersonalFiles();
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles();
await searchInput.searchFor(random);

17
e2e/protractor/suites/actions-available/files-folders/office-files-actions.test.ts
View File

@@ -22,18 +22,7 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import {
RepoClient,
Utils,
AdminActions,
UserActions,
LoginPage,
SearchResultsPage,
BrowsingPage,
APP_ROUTES,
navigate,
FILES
} from '@alfresco/aca-testing-shared';
import { RepoClient, Utils, AdminActions, UserActions, LoginPage, FILES, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
import * as testData from './test-data';
import * as testUtil from '../test-util';
@@ -54,7 +43,7 @@ describe('Office Files - available actions : ', () => {
const loginPage = new LoginPage();
const page = new BrowsingPage();
const { dataTable } = page;
const { dataTable, toolbar } = page;
const { searchInput } = page.pageLayoutHeader;
const searchResultsPage = new SearchResultsPage();
@@ -257,7 +246,7 @@ describe('Office Files - available actions : ', () => {
describe('on Search Results : ', () => {
beforeEach(async () => {
await page.clickPersonalFiles();
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(random);
await searchResultsPage.waitForResults();

16
e2e/protractor/suites/actions-available/files-folders/single-file-actions.test.ts
View File

@@ -22,17 +22,7 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import {
RepoClient,
Utils,
AdminActions,
UserActions,
LoginPage,
SearchResultsPage,
BrowsingPage,
APP_ROUTES,
navigate
} from '@alfresco/aca-testing-shared';
import { RepoClient, Utils, AdminActions, UserActions, LoginPage, BrowsingPage, SearchResultsPage } from '@alfresco/aca-testing-shared';
import * as testData from './test-data';
import * as testUtil from '../test-util';
import { Logger } from '@alfresco/adf-testing';
@@ -54,7 +44,7 @@ describe('Files - available actions : ', () => {
const loginPage = new LoginPage();
const page = new BrowsingPage();
const { dataTable } = page;
const { dataTable, toolbar } = page;
const { searchInput } = page.pageLayoutHeader;
const searchResultsPage = new SearchResultsPage();
@@ -241,7 +231,7 @@ describe('Files - available actions : ', () => {
describe('on Search Results : ', () => {
beforeEach(async () => {
await page.clickPersonalFiles();
await navigate(APP_ROUTES.SEARCH);
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
});

166
e2e/protractor/suites/actions-available/special-permissions/other-permissions.ts
View File

@@ -22,12 +22,14 @@
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import { BrowsingPage, Utils } from '@alfresco/aca-testing-shared';
import { BrowsingPage, SearchResultsPage, Utils } from '@alfresco/aca-testing-shared';
import * as testData from './test-data-permissions';
import * as testUtil from '../test-util';
const page = new BrowsingPage();
const { dataTable } = page;
const { dataTable, toolbar } = page;
const searchResultsPage = new SearchResultsPage();
const { searchInput } = searchResultsPage.pageLayoutHeader;
export function collaboratorTests(siteName?: string) {
describe('available actions : ', () => {
@@ -70,16 +72,16 @@ export function collaboratorTests(siteName?: string) {
await testUtil.checkToolbarActions(testData.fileSharedFav.name, expectedToolbarPrimary, expectedToolbarMore);
});
// it('on Search Results - [C297653]', async () => {
// await toolbar.clickSearchIconButton();
// await searchInput.clickSearchButton();
// await searchInput.searchFor(testData.fileSharedFav.name);
it('on Search Results - [C297653]', async () => {
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(testData.fileSharedFav.name);
// const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
// const expectedToolbarMore = ['Edit Offline', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions', 'Edit Aspects', 'Permissions'];
const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
const expectedToolbarMore = ['Edit Offline', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions', 'Edit Aspects', 'Permissions'];
// await testUtil.checkToolbarActions(testData.fileSharedFav.name, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkToolbarActions(testData.fileSharedFav.name, expectedToolbarPrimary, expectedToolbarMore);
});
describe('available actions in the viewer : ', () => {
it('file opened from File Libraries - [C297654]', async () => {
@@ -138,26 +140,26 @@ export function collaboratorTests(siteName?: string) {
await testUtil.checkViewerActions(testData.fileDocxSharedFav.name, expectedToolbarPrimary, expectedToolbarMore);
});
// it('file opened from Search Results - [C306992]', async () => {
// await toolbar.clickSearchIconButton();
// await searchInput.clickSearchButton();
// await searchInput.searchFor(testData.fileDocxSharedFav.name);
// await searchResultsPage.waitForResults();
it('file opened from Search Results - [C306992]', async () => {
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(testData.fileDocxSharedFav.name);
await searchResultsPage.waitForResults();
// const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
// const expectedToolbarMore = [
// 'Edit in Microsoft Office™',
// 'Edit Offline',
// 'Upload New Version',
// 'Remove Favorite',
// 'Copy',
// 'Manage Versions',
// 'Edit Aspects',
// 'Permissions'
// ];
const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
const expectedToolbarMore = [
'Edit in Microsoft Office™',
'Edit Offline',
'Upload New Version',
'Remove Favorite',
'Copy',
'Manage Versions',
'Edit Aspects',
'Permissions'
];
// await testUtil.checkViewerActions(testData.fileDocxSharedFav.name, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkViewerActions(testData.fileDocxSharedFav.name, expectedToolbarPrimary, expectedToolbarMore);
});
});
});
}
@@ -202,17 +204,17 @@ export function filesLockedByCurrentUser(siteName?: string) {
await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
// it('on Search Results - [C297660]', async () => {
// await toolbar.clickSearchIconButton();
// await searchInput.clickSearchButton();
// await searchInput.searchFor(testData.fileLockedByUser);
// await searchResultsPage.waitForResults();
it('on Search Results - [C297660]', async () => {
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(testData.fileLockedByUser);
await searchResultsPage.waitForResults();
// const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
// const expectedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions'];
const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
const expectedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions'];
// await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
describe('available actions in the viewer : ', () => {
it('file opened from File Libraries - [C297661]', async () => {
@@ -244,22 +246,22 @@ export function filesLockedByCurrentUser(siteName?: string) {
await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
// it('file opened from Search Results - [C306993]', async () => {
// await toolbar.clickSearchIconButton();
// await searchInput.clickSearchButton();
// await searchInput.searchFor(testData.fileLockedByUser);
// await searchResultsPage.waitForResults();
it('file opened from Search Results - [C306993]', async () => {
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(testData.fileLockedByUser);
await searchResultsPage.waitForResults();
// const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
// const expectedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions'];
const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
const expectedToolbarMore = ['Cancel Editing', 'Upload New Version', 'Remove Favorite', 'Copy', 'Manage Versions'];
// await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
});
});
}
export function filesLockedByOtherUser() {
export function filesLockedByOtherUser(siteName?: string) {
describe('available actions : ', () => {
beforeEach(async () => {
await Utils.pressEscape();
@@ -269,16 +271,16 @@ export function filesLockedByOtherUser() {
await page.closeOpenDialogs();
});
// it('on File Libraries - [C297664]', async () => {
// await page.goToMyLibrariesAndWait();
// await dataTable.doubleClickOnRowByName(siteName);
// await dataTable.waitForHeader();
it('on File Libraries - [C297664]', async () => {
await page.goToMyLibrariesAndWait();
await dataTable.doubleClickOnRowByName(siteName);
await dataTable.waitForHeader();
// const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
// const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions', 'Permissions'];
const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions', 'Permissions'];
// await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
it('on Shared Files - [C297665]', async () => {
await page.clickSharedFilesAndWait();
@@ -310,29 +312,29 @@ export function filesLockedByOtherUser() {
await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
// it('on Search Results - [C297667]', async () => {
// await toolbar.clickSearchIconButton();
// await searchInput.clickSearchButton();
// await searchInput.searchFor(testData.fileLockedByUser);
// await searchResultsPage.waitForResults();
it('on Search Results - [C297667]', async () => {
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(testData.fileLockedByUser);
await searchResultsPage.waitForResults();
// const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
// const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Copy', 'Manage Versions', 'Permissions'];
const expectedToolbarPrimary = ['Shared Link Settings', 'Download', 'View', 'View Details', 'More Actions'];
const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Copy', 'Manage Versions', 'Permissions'];
// await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkToolbarActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
describe('available actions in the viewer : ', () => {
// it('file opened from File Libraries - [C297671]', async () => {
// await page.goToMyLibrariesAndWait();
// await dataTable.doubleClickOnRowByName(siteName);
// await dataTable.waitForHeader();
it('file opened from File Libraries - [C297671]', async () => {
await page.goToMyLibrariesAndWait();
await dataTable.doubleClickOnRowByName(siteName);
await dataTable.waitForHeader();
// const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
// const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions', 'Permissions'];
const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Move', 'Copy', 'Delete', 'Manage Versions', 'Permissions'];
// await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
it('file opened from Shared Files - [C297672]', async () => {
await page.clickSharedFilesAndWait();
@@ -352,18 +354,18 @@ export function filesLockedByOtherUser() {
await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
// it('file opened from Search Results - [C306994]', async () => {
// await toolbar.clickSearchIconButton();
// await searchInput.clickSearchButton();
// await searchInput.searchFor(testData.fileLockedByUser);
// await searchResultsPage.waitForResults();
it('file opened from Search Results - [C306994]', async () => {
await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton();
await searchInput.searchFor(testData.fileLockedByUser);
await searchResultsPage.waitForResults();
// const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
// // TODO: add 'Move' and 'Delete' when ACA-2319 is fixed
// const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Copy', 'Manage Versions', 'Permissions'];
const expectedToolbarPrimary = ['Activate full-screen mode', 'Shared Link Settings', 'Download', 'Print', 'View Details', 'More Actions'];
// TODO: add 'Move' and 'Delete' when ACA-2319 is fixed
const expectedToolbarMore = ['Cancel Editing', 'Remove Favorite', 'Copy', 'Manage Versions', 'Permissions'];
// await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
// });
await testUtil.checkViewerActions(testData.fileLockedByUser, expectedToolbarPrimary, expectedToolbarMore);
});
});
});
}

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

@@ -211,6 +211,6 @@ describe('Special permissions : ', () => {
await loginPage.loginWith(userManager);
});
filesLockedByOtherUser();
filesLockedByOtherUser(sitePrivate);
});
});

2
e2e/protractor/suites/actions-available/special-permissions/viewer.ts
View File

@@ -43,7 +43,7 @@ export function viewerTests(siteName?: string) {
describe('file opened from File Libraries', () => {
beforeAll(async () => {
await page.goToMyLibrariesAndWait();
await page.goToMyLibraries();
await dataTable.doubleClickOnRowByName(siteName);
await dataTable.waitForHeader();
});

3
projects/aca-testing-shared/src/configs.ts
View File

@@ -41,8 +41,7 @@ export const APP_ROUTES = {
PERSONAL_FILES: '/personal-files',
RECENT_FILES: '/recent-files',
SHARED_FILES: '/shared',
TRASHCAN: '/trashcan',
SEARCH: '/search'
TRASHCAN: '/trashcan'
};
// Sidebar labels