[no-issue] Parallel run e2e and e2e common action refactoring (#4702)

This commit is contained in:
Eugenio Romano
2019-05-13 04:44:35 +02:00
committed by GitHub
parent a48bfc3714
commit 898e3b5a80
288 changed files with 8704 additions and 5130 deletions

View File

@@ -24,8 +24,8 @@ 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 } from '@alfresco/adf-testing';
import { browser, protractor } from 'protractor';
import { StringUtil, BrowserActions } from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { FolderModel } from '../../models/ACS/folderModel';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { NotificationPage } from '../../pages/adf/notificationPage';
@@ -176,13 +176,12 @@ describe('Permissions Component', function () {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await folders.forEach(function (folder) {
uploadActions.deleteFilesOrFolder(alfrescoJsApi, folder.entry.id);
});
done();
});
describe('Inherit and assigning permissions', function () {
describe('Inherit and assigning permissions', () => {
beforeEach(async (done) => {
@@ -190,7 +189,7 @@ describe('Permissions Component', function () {
file = await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, fileModel.name, '-my-');
loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
await loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
contentServicesPage.goToDocumentList();
contentServicesPage.checkContentIsDisplayed(fileModel.name);
@@ -206,27 +205,25 @@ describe('Permissions Component', function () {
});
afterEach(async (done) => {
await uploadActions.deleteFilesOrFolder(alfrescoJsApi, file.entry.id);
try {
await uploadActions.deleteFilesOrFolder(alfrescoJsApi, file.entry.id);
} catch (error) {
}
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');
@@ -236,66 +233,43 @@ describe('Permissions Component', function () {
});
it('[C286272] Should be able to see results when searching for a user', () => {
permissionsPage.checkAddPermissionButtonIsDisplayed();
permissionsPage.clickAddPermissionButton();
permissionsPage.checkAddPermissionDialogIsDisplayed();
permissionsPage.checkSearchUserInputIsDisplayed();
permissionsPage.searchUserOrGroup('a');
permissionsPage.checkResultListIsDisplayed();
});
it('[C276979] Should be able to give permissions to a group of people', () => {
permissionsPage.checkAddPermissionButtonIsDisplayed();
permissionsPage.clickAddPermissionButton();
permissionsPage.checkAddPermissionDialogIsDisplayed();
permissionsPage.checkSearchUserInputIsDisplayed();
permissionsPage.searchUserOrGroup('GROUP_' + groupBody.id);
permissionsPage.clickUserOrGroup('GROUP_' + groupBody.id);
permissionsPage.checkUserOrGroupIsAdded('GROUP_' + groupBody.id);
});
it('[C277100] Should display EVERYONE group in the search result set', () => {
permissionsPage.checkAddPermissionButtonIsDisplayed();
permissionsPage.clickAddPermissionButton();
permissionsPage.checkAddPermissionDialogIsDisplayed();
permissionsPage.checkSearchUserInputIsDisplayed();
permissionsPage.searchUserOrGroup(filePermissionUser.getId());
permissionsPage.checkResultListIsDisplayed();
permissionsPage.checkUserOrGroupIsDisplayed('EVERYONE');
permissionsPage.searchUserOrGroup('somerandomtext');
permissionsPage.checkResultListIsDisplayed();
permissionsPage.checkUserOrGroupIsDisplayed('EVERYONE');
});
});
describe('Changing and duplicate Permissions', function () {
describe('Changing and duplicate Permissions', () => {
beforeEach(async (done) => {
@@ -303,12 +277,10 @@ describe('Permissions Component', function () {
file = await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, fileModel.name, '-my-');
loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
await loginPage.loginToContentServicesUsingUserModel(fileOwnerUser);
contentServicesPage.goToDocumentList();
contentServicesPage.checkContentIsDisplayed(fileModel.name);
contentServicesPage.checkSelectedSiteIsDisplayed('My files');
contentList.rightClickOnRow(fileModel.name);
@@ -316,17 +288,11 @@ describe('Permissions Component', function () {
contentServicesPage.pressContextMenuActionNamed('Permission');
permissionsPage.checkAddPermissionButtonIsDisplayed();
permissionsPage.clickAddPermissionButton();
permissionsPage.checkAddPermissionDialogIsDisplayed();
permissionsPage.checkSearchUserInputIsDisplayed();
permissionsPage.searchUserOrGroup(filePermissionUser.getId());
permissionsPage.clickUserOrGroup(filePermissionUser.getFirstName());
permissionsPage.checkUserOrGroupIsAdded(filePermissionUser.getId());
done();
@@ -345,38 +311,30 @@ describe('Permissions Component', function () {
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Contributor');
permissionsPage.clickRoleDropdown();
permissionsPage.clickRoleDropdownByUserOrGroupName(filePermissionUser.getId());
expect(permissionsPage.getRoleDropdownOptions().count()).toBe(5);
expect(permissionsPage.getRoleDropdownOptions().get(0).getText()).toBe('Contributor');
expect(permissionsPage.getRoleDropdownOptions().get(1).getText()).toBe('Collaborator');
expect(permissionsPage.getRoleDropdownOptions().get(2).getText()).toBe('Coordinator');
expect(permissionsPage.getRoleDropdownOptions().get(3).getText()).toBe('Editor');
expect(permissionsPage.getRoleDropdownOptions().get(4).getText()).toBe('Consumer');
permissionsPage.selectOption('Collaborator');
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Collaborator');
permissionsPage.clickRoleDropdown();
permissionsPage.clickRoleDropdownByUserOrGroupName(filePermissionUser.getId());
permissionsPage.selectOption('Coordinator');
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Coordinator');
permissionsPage.clickRoleDropdown();
permissionsPage.clickRoleDropdownByUserOrGroupName(filePermissionUser.getId());
permissionsPage.selectOption('Editor');
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Editor');
permissionsPage.clickRoleDropdown();
permissionsPage.clickRoleDropdownByUserOrGroupName(filePermissionUser.getId());
permissionsPage.selectOption('Consumer');
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Consumer');
@@ -384,17 +342,12 @@ describe('Permissions Component', function () {
});
it('[C276980] Should not be able to duplicate User or Group to the locally set permissions', () => {
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Contributor');
permissionsPage.clickAddPermissionButton();
permissionsPage.checkAddPermissionDialogIsDisplayed();
permissionsPage.checkSearchUserInputIsDisplayed();
permissionsPage.searchUserOrGroup(filePermissionUser.getId());
permissionsPage.clickUserOrGroup(filePermissionUser.getFirstName());
expect(permissionsPage.getAssignPermissionErrorText()).toBe(duplicateUserPermissionMessage);
@@ -402,7 +355,6 @@ describe('Permissions Component', function () {
});
it('[C276982] Should be able to remove User or Group from the locally set permissions', () => {
expect(permissionsPage.getRoleCellValue(filePermissionUser.getId())).toEqual('Contributor');
permissionsPage.clickDeletePermissionButton();
@@ -413,11 +365,11 @@ describe('Permissions Component', function () {
});
describe('Role: Consumer, Contributor, Coordinator, Collaborator, Editor, No Permissions', function () {
describe('Role: Consumer, Contributor, Coordinator, Collaborator, Editor, No Permissions', () => {
it('[C276993] Role Consumer', () => {
it('[C276993] Role Consumer', async () => {
loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
await loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
navigationBarPage.openContentServicesFolder(roleConsumerFolder.entry.id);
@@ -432,7 +384,7 @@ describe('Permissions Component', function () {
contentServicesPage.checkDeleteIsDisabled('RoleConsumer' + fileModel.name);
browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
BrowserActions.closeMenuAndDialogs();
contentList.checkActionMenuIsNotDisplayed();
@@ -446,9 +398,9 @@ describe('Permissions Component', function () {
});
it('[C276996] Role Contributor', () => {
it('[C276996] Role Contributor', async () => {
loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
await loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
navigationBarPage.openContentServicesFolder(roleContributorFolder.entry.id);
@@ -463,7 +415,7 @@ describe('Permissions Component', function () {
contentServicesPage.checkDeleteIsDisabled('RoleContributor' + fileModel.name);
browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
BrowserActions.closeMenuAndDialogs();
contentList.checkActionMenuIsNotDisplayed();
@@ -478,9 +430,9 @@ describe('Permissions Component', function () {
});
it('[C277000] Role Editor', () => {
it('[C277000] Role Editor', async () => {
loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
await loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
navigationBarPage.openContentServicesFolder(roleEditorFolder.entry.id);
@@ -495,7 +447,7 @@ describe('Permissions Component', function () {
contentServicesPage.checkDeleteIsDisabled('RoleEditor' + fileModel.name);
browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
BrowserActions.closeMenuAndDialogs();
browser.controlFlow().execute(async () => {
@@ -525,9 +477,9 @@ describe('Permissions Component', function () {
});
it('[C277003] Role Collaborator', () => {
it('[C277003] Role Collaborator', async () => {
loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
await loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
navigationBarPage.openContentServicesFolder(roleCollaboratorFolder.entry.id);
@@ -542,7 +494,7 @@ describe('Permissions Component', function () {
contentServicesPage.checkDeleteIsDisabled('RoleCollaborator' + fileModel.name);
browser.actions().sendKeys(protractor.Key.ESCAPE).perform();
BrowserActions.closeMenuAndDialogs();
browser.controlFlow().execute(async () => {
@@ -573,9 +525,9 @@ describe('Permissions Component', function () {
});
it('[C277004] Role Coordinator', () => {
it('[C277004] Role Coordinator', async () => {
loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
await loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
navigationBarPage.openContentServicesFolder(roleCoordinatorFolder.entry.id);
@@ -618,9 +570,9 @@ describe('Permissions Component', function () {
});
it('[C279881] No Permission User', () => {
it('[C279881] No Permission User', async () => {
loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
await loginPage.loginToContentServicesUsingUserModel(filePermissionUser);
navigationBarPage.openContentServicesFolder(roleConsumerFolder.entry.id);