inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

'Testing' Moved Upload Actions to shared testing package (#4616)

Browse Source 
* 'Testing' Moved Upload Actions to shared testing package

* Updated Upload Actionswith suggested changes

* Failing tests updated

* Resolving merge conflicts

* updating latest merge conflicts

* resolved merge conflicts

* update to fix previous issues with this.

* testing changes

* fix for failed travis test

* updates to fix failing travis test

* fixes file path error

* latest fix for failing travis test

* latest fix for failing travis test

* Fixing undefined rootPath

* fixes timing issues in content-services travis test

* resolves requested changes
This commit is contained in:
Alexa Fabian
2019-06-17 15:07:25 +01:00
committed by Eugenio Romano
parent 5f1caca5da
commit 725cf22956
60 changed files with 858 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
e2e/content-services/permissions/permissions-component.e2e.ts
View File

@@ -21,8 +21,7 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel';
import { UploadActions } from '../../actions/ACS/upload.actions';
import { StringUtil, BrowserActions, LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing';
import { StringUtil, BrowserActions, NotificationHistoryPage, LoginPage, UploadActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { FolderModel } from '../../models/ACS/folderModel';
import { ViewerPage } from '../../pages/adf/viewerPage';
@@ -32,14 +31,17 @@ import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
describe('Permissions Component', function () {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: browser.params.testConfig.adf.url
});
const loginPage = new LoginPage();
const contentServicesPage = new ContentServicesPage();
const permissionsPage = new PermissionsPage();
const navigationBarPage = new NavigationBarPage();
const uploadActions = new UploadActions();
const uploadActions = new UploadActions(this.alfrescoJsApi);
const contentList = contentServicesPage.getDocumentList();
const viewerPage = new ViewerPage();
const metadataViewPage = new MetadataViewPage();
const notificationPage = new NotificationHistoryPage();
@@ -65,11 +67,6 @@ describe('Permissions Component', function () {
displayName: StringUtil.generateRandomString()
};
const alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: browser.params.testConfig.adf.url
});
const roleConsumerFolderModel = new FolderModel({ 'name': 'roleConsumer' + StringUtil.generateRandomString() });
const roleCoordinatorFolderModel = new FolderModel({ 'name': 'roleCoordinator' + StringUtil.generateRandomString() });
const roleCollaboratorFolderModel = new FolderModel({ 'name': 'roleCollaborator' + StringUtil.generateRandomString() });
@@ -86,23 +83,21 @@ describe('Permissions Component', function () {
beforeAll(async (done) => {
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(fileOwnerUser);
await this.alfrescoJsApi.core.peopleApi.addPerson(filePermissionUser);
await this.alfrescoJsApi.core.groupsApi.createGroup(groupBody);
await this.alfrescoJsApi.login(fileOwnerUser.id, fileOwnerUser.password);
await alfrescoJsApi.core.peopleApi.addPerson(fileOwnerUser);
await alfrescoJsApi.core.peopleApi.addPerson(filePermissionUser);
await alfrescoJsApi.core.groupsApi.createGroup(groupBody);
await alfrescoJsApi.login(fileOwnerUser.id, fileOwnerUser.password);
roleConsumerFolder = await uploadActions.createFolder(alfrescoJsApi, roleConsumerFolderModel.name, '-my-');
roleCoordinatorFolder = await uploadActions.createFolder(alfrescoJsApi, roleCoordinatorFolderModel.name, '-my-');
roleContributorFolder = await uploadActions.createFolder(alfrescoJsApi, roleContributorFolderModel.name, '-my-');
roleCollaboratorFolder = await uploadActions.createFolder(alfrescoJsApi, roleCollaboratorFolderModel.name, '-my-');
roleEditorFolder = await uploadActions.createFolder(alfrescoJsApi, roleEditorFolderModel.name, '-my-');
roleConsumerFolder = await uploadActions.createFolder(roleConsumerFolderModel.name, '-my-');
roleCoordinatorFolder = await uploadActions.createFolder(roleCoordinatorFolderModel.name, '-my-');
roleContributorFolder = await uploadActions.createFolder(roleContributorFolderModel.name, '-my-');
roleCollaboratorFolder = await uploadActions.createFolder(roleCollaboratorFolderModel.name, '-my-');
roleEditorFolder = await uploadActions.createFolder(roleEditorFolderModel.name, '-my-');
folders = [roleConsumerFolder, roleContributorFolder, roleCoordinatorFolder, roleCollaboratorFolder, roleEditorFolder];
await alfrescoJsApi.core.nodesApi.updateNode(roleConsumerFolder.entry.id,
await this.alfrescoJsApi.core.nodesApi.updateNode(roleConsumerFolder.entry.id,
{
permissions: {
@@ -114,7 +109,7 @@ describe('Permissions Component', function () {
}
});
await alfrescoJsApi.core.nodesApi.updateNode(roleCollaboratorFolder.entry.id,
await this.alfrescoJsApi.core.nodesApi.updateNode(roleCollaboratorFolder.entry.id,
{
permissions: {
locallySet: [{
@@ -125,7 +120,7 @@ describe('Permissions Component', function () {
}
});
await alfrescoJsApi.core.nodesApi.updateNode(roleCoordinatorFolder.entry.id,
await this.alfrescoJsApi.core.nodesApi.updateNode(roleCoordinatorFolder.entry.id,
{
permissions: {
locallySet: [{
@@ -136,7 +131,7 @@ describe('Permissions Component', function () {
}
});
await alfrescoJsApi.core.nodesApi.updateNode(roleContributorFolder.entry.id,
await this.alfrescoJsApi.core.nodesApi.updateNode(roleContributorFolder.entry.id,
{
permissions: {
@@ -148,7 +143,7 @@ describe('Permissions Component', function () {
}
});
await alfrescoJsApi.core.nodesApi.updateNode(roleEditorFolder.entry.id,
await this.alfrescoJsApi.core.nodesApi.updateNode(roleEditorFolder.entry.id,
{
permissions: {
@@ -160,33 +155,34 @@ describe('Permissions Component', function () {
}
});
await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, 'RoleConsumer' + fileModel.name, roleConsumerFolder.entry.id);
await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, 'RoleContributor' + fileModel.name, roleContributorFolder.entry.id);
await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, 'RoleCoordinator' + fileModel.name, roleCoordinatorFolder.entry.id);
await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, 'RoleCollaborator' + fileModel.name, roleCollaboratorFolder.entry.id);
await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, 'RoleEditor' + fileModel.name, roleEditorFolder.entry.id);
await uploadActions.uploadFile(fileModel.location, 'RoleConsumer' + fileModel.name, roleConsumerFolder.entry.id);
await uploadActions.uploadFile(fileModel.location, 'RoleContributor' + fileModel.name, roleContributorFolder.entry.id);
await uploadActions.uploadFile(fileModel.location, 'RoleCoordinator' + fileModel.name, roleCoordinatorFolder.entry.id);
await uploadActions.uploadFile(fileModel.location, 'RoleCollaborator' + fileModel.name, roleCollaboratorFolder.entry.id);
await uploadActions.uploadFile(fileModel.location, 'RoleEditor' + fileModel.name, roleEditorFolder.entry.id);
done();
});
afterAll(async (done) => {
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await folders.forEach(function (folder) {
uploadActions.deleteFilesOrFolder(alfrescoJsApi, folder.entry.id);
uploadActions.deleteFileOrFolder(folder.entry.id);
});
done();
});
describe('Inherit and assigning permissions', () => {
describe('Inherit and assigning permissions', () => {
beforeEach(async (done) => {
await alfrescoJsApi.login(fileOwnerUser.id, fileOwnerUser.password);
await this.alfrescoJsApi.login(fileOwnerUser.id, fileOwnerUser.password);
file = await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, fileModel.name, '-my-');
file = await uploadActions.uploadFile(fileModel.location, fileModel.name, '-my-');
await loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
contentServicesPage.goToDocumentList();
contentServicesPage.checkContentIsDisplayed(fileModel.name);
@@ -202,29 +198,21 @@ describe('Permissions Component', function () {
});
afterEach(async (done) => {
try {
await uploadActions.deleteFilesOrFolder(alfrescoJsApi, file.entry.id);
} catch (error) {
}
await uploadActions.deleteFileOrFolder(file.entry.id);
done();
});
it('[C268974] Inherit Permission', () => {
permissionsPage.checkPermissionInheritedButtonIsDisplayed();
expect(permissionsPage.getPermissionInheritedButtonText()).toBe('Permission Inherited');
permissionsPage.checkPermissionsDatatableIsDisplayed();
permissionsPage.clickPermissionInheritedButton();
expect(permissionsPage.getPermissionInheritedButtonText()).toBe('Inherit Permission');
permissionsPage.checkNoPermissionsIsDisplayed();
permissionsPage.clickPermissionInheritedButton();
expect(permissionsPage.getPermissionInheritedButtonText()).toBe('Permission Inherited');
permissionsPage.checkPermissionsDatatableIsDisplayed();
});
@@ -266,15 +254,15 @@ describe('Permissions Component', function () {
});
describe('Changing and duplicate Permissions', () => {
describe('Changing and duplicate Permissions', () => {
beforeEach(async (done) => {
await alfrescoJsApi.login(fileOwnerUser.id, fileOwnerUser.password);
await this.alfrescoJsApi.login(fileOwnerUser.id, fileOwnerUser.password);
file = await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, fileModel.name, '-my-');
file = await uploadActions.uploadFile(fileModel.location, fileModel.name, '-my-');
await loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
contentServicesPage.goToDocumentList();
contentServicesPage.checkContentIsDisplayed(fileModel.name);
@@ -299,7 +287,7 @@ describe('Permissions Component', function () {
afterEach(async (done) => {
try {
await uploadActions.deleteFilesOrFolder(alfrescoJsApi, file.entry.id);
await uploadActions.deleteFileOrFolder(file.entry.id);
} catch (error) {
@@ -359,7 +347,6 @@ describe('Permissions Component', function () {
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Contributor');
permissionsPage.clickDeletePermissionButton();
permissionsPage.checkUserOrGroupIsDeleted(filePermissionUser.getId());
});