mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
[ADF-4376] Fix Sticky Header in Datatable Component (#4582)
* [ADF-4376] Fix Sticky Header in Datatable Component * [ADF-4374] Rebase branch * remove search from permissions test * remove search from permissions test
This commit is contained in:
davidcanonieto
committed by
Eugenio Romano
Eugenio Romano
parent
4215666a96
commit
4cc449dfbb
@@ -16,63 +16,36 @@
|
||||
*/
|
||||
|
||||
import { PermissionsPage } from '../../pages/adf/permissionsPage';
|
||||
|
||||
import { LoginPage } from '@alfresco/adf-testing';
|
||||
|
||||
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
|
||||
|
||||
import { AcsUserModel } from '../../models/ACS/acsUserModel';
|
||||
|
||||
import TestConfig = require('../../test.config');
|
||||
|
||||
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 { SearchDialog } from '../../pages/adf/dialog/searchDialog';
|
||||
|
||||
import { ViewerPage } from '../../pages/adf/viewerPage';
|
||||
|
||||
import { NotificationPage } from '../../pages/adf/notificationPage';
|
||||
|
||||
import CONSTANTS = require('../../util/constants');
|
||||
|
||||
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
|
||||
|
||||
import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
|
||||
|
||||
import { VersionManagePage } from '../../pages/adf/versionManagerPage';
|
||||
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
|
||||
|
||||
describe('Permissions Component', function () {
|
||||
|
||||
const loginPage = new LoginPage();
|
||||
|
||||
const contentServicesPage = new ContentServicesPage();
|
||||
|
||||
const permissionsPage = new PermissionsPage();
|
||||
|
||||
const uploadActions = new UploadActions();
|
||||
|
||||
const contentList = contentServicesPage.getDocumentList();
|
||||
|
||||
const searchDialog = new SearchDialog();
|
||||
|
||||
const viewerPage = new ViewerPage();
|
||||
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const metadataViewPage = new MetadataViewPage();
|
||||
|
||||
const notificationPage = new NotificationPage();
|
||||
|
||||
const versionManagePage = new VersionManagePage();
|
||||
|
||||
const uploadDialog = new UploadDialog();
|
||||
|
||||
let folderOwnerUser, consumerUser, siteConsumerUser, contributorUser, managerUser, collaboratorUser;
|
||||
@@ -80,49 +53,32 @@ describe('Permissions Component', function () {
|
||||
let publicSite, privateSite, folderName;
|
||||
|
||||
const fileModel = new FileModel({
|
||||
|
||||
'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
|
||||
|
||||
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
|
||||
|
||||
});
|
||||
|
||||
const testFileModel = new FileModel({
|
||||
|
||||
'name': resources.Files.ADF_DOCUMENTS.TEST.file_name,
|
||||
|
||||
'location': resources.Files.ADF_DOCUMENTS.TEST.file_location
|
||||
|
||||
});
|
||||
|
||||
const pngFileModel = new FileModel({
|
||||
|
||||
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
|
||||
|
||||
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
|
||||
|
||||
});
|
||||
|
||||
const alfrescoJsApi = new AlfrescoApi({
|
||||
|
||||
provider: 'ECM',
|
||||
|
||||
hostEcm: TestConfig.adf.url
|
||||
|
||||
});
|
||||
|
||||
let siteFolder, privateSiteFile;
|
||||
|
||||
folderOwnerUser = new AcsUserModel();
|
||||
|
||||
consumerUser = new AcsUserModel();
|
||||
|
||||
siteConsumerUser = new AcsUserModel();
|
||||
|
||||
collaboratorUser = new AcsUserModel();
|
||||
|
||||
contributorUser = new AcsUserModel();
|
||||
|
||||
managerUser = new AcsUserModel();
|
||||
|
||||
beforeAll(async (done) => {
|
||||
@@ -130,17 +86,11 @@ describe('Permissions Component', function () {
|
||||
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
|
||||
await alfrescoJsApi.core.peopleApi.addPerson(folderOwnerUser);
|
||||
|
||||
await alfrescoJsApi.core.peopleApi.addPerson(siteConsumerUser);
|
||||
|
||||
await alfrescoJsApi.core.peopleApi.addPerson(consumerUser);
|
||||
|
||||
await alfrescoJsApi.core.peopleApi.addPerson(contributorUser);
|
||||
|
||||
await alfrescoJsApi.core.peopleApi.addPerson(collaboratorUser);
|
||||
|
||||
await alfrescoJsApi.core.peopleApi.addPerson(managerUser);
|
||||
|
||||
await alfrescoJsApi.login(folderOwnerUser.id, folderOwnerUser.password);
|
||||
|
||||
const publicSiteName = `PUBLIC_TEST_SITE_${StringUtil.generateRandomString(5)}`;
|
||||
@@ -154,47 +104,31 @@ describe('Permissions Component', function () {
|
||||
const privateSiteBody = {visibility: 'PRIVATE', title: privateSiteName};
|
||||
|
||||
publicSite = await alfrescoJsApi.core.sitesApi.createSite(publicSiteBody);
|
||||
|
||||
privateSite = await alfrescoJsApi.core.sitesApi.createSite(privateSiteBody);
|
||||
|
||||
await alfrescoJsApi.core.sitesApi.addSiteMember(publicSite.entry.id, {
|
||||
|
||||
id: siteConsumerUser.id,
|
||||
|
||||
role: CONSTANTS.CS_USER_ROLES.CONSUMER
|
||||
|
||||
});
|
||||
|
||||
await alfrescoJsApi.core.sitesApi.addSiteMember(publicSite.entry.id, {
|
||||
|
||||
id: collaboratorUser.id,
|
||||
|
||||
role: CONSTANTS.CS_USER_ROLES.COLLABORATOR
|
||||
|
||||
});
|
||||
|
||||
await alfrescoJsApi.core.sitesApi.addSiteMember(publicSite.entry.id, {
|
||||
|
||||
id: contributorUser.id,
|
||||
|
||||
role: CONSTANTS.CS_USER_ROLES.CONTRIBUTOR
|
||||
|
||||
});
|
||||
|
||||
await alfrescoJsApi.core.sitesApi.addSiteMember(publicSite.entry.id, {
|
||||
|
||||
id: managerUser.id,
|
||||
|
||||
role: CONSTANTS.CS_USER_ROLES.MANAGER
|
||||
|
||||
});
|
||||
|
||||
await alfrescoJsApi.core.sitesApi.addSiteMember(privateSite.entry.id, {
|
||||
|
||||
id: managerUser.id,
|
||||
|
||||
role: CONSTANTS.CS_USER_ROLES.MANAGER
|
||||
|
||||
});
|
||||
|
||||
siteFolder = await uploadActions.createFolder(alfrescoJsApi, folderName, publicSite.entry.guid);
|
||||
@@ -204,27 +138,17 @@ describe('Permissions Component', function () {
|
||||
await alfrescoJsApi.core.nodesApi.updateNode(privateSiteFile.entry.id,
|
||||
|
||||
{
|
||||
|
||||
permissions: {
|
||||
|
||||
locallySet: [{
|
||||
|
||||
authorityId: managerUser.getId(),
|
||||
|
||||
name: 'SiteConsumer',
|
||||
|
||||
accessStatus: 'ALLOWED'
|
||||
|
||||
}]
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
await uploadActions.uploadFile(alfrescoJsApi, fileModel.location, 'Site' + fileModel.name, siteFolder.entry.id);
|
||||
|
||||
browser.driver.sleep(15000); // wait search get the groups, files and folders
|
||||
|
||||
done();
|
||||
|
||||
});
|
||||
@@ -232,13 +156,10 @@ describe('Permissions Component', function () {
|
||||
afterAll(async (done) => {
|
||||
|
||||
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
|
||||
await alfrescoJsApi.core.sitesApi.deleteSite(publicSite.entry.id);
|
||||
|
||||
await alfrescoJsApi.core.sitesApi.deleteSite(privateSite.entry.id);
|
||||
|
||||
done();
|
||||
|
||||
});
|
||||
|
||||
describe('Role Site Dropdown', function () {
|
||||
@@ -258,23 +179,14 @@ describe('Permissions Component', function () {
|
||||
contentServicesPage.pressContextMenuActionNamed('Permission');
|
||||
|
||||
permissionsPage.checkPermissionInheritedButtonIsDisplayed();
|
||||
|
||||
permissionsPage.checkAddPermissionButtonIsDisplayed();
|
||||
|
||||
permissionsPage.clickAddPermissionButton();
|
||||
|
||||
permissionsPage.checkAddPermissionDialogIsDisplayed();
|
||||
|
||||
permissionsPage.checkSearchUserInputIsDisplayed();
|
||||
|
||||
permissionsPage.searchUserOrGroup(consumerUser.getId());
|
||||
|
||||
permissionsPage.clickUserOrGroup(consumerUser.getFirstName());
|
||||
|
||||
permissionsPage.checkUserOrGroupIsAdded(consumerUser.getId());
|
||||
|
||||
done();
|
||||
|
||||
});
|
||||
|
||||
it('[C277002] Should display the Role Site dropdown', () => {
|
||||
@@ -303,21 +215,7 @@ describe('Permissions Component', function () {
|
||||
|
||||
loginPage.loginToContentServicesUsingUserModel(siteConsumerUser);
|
||||
|
||||
contentServicesPage.goToDocumentList();
|
||||
|
||||
searchDialog
|
||||
|
||||
.checkSearchIconIsVisible()
|
||||
|
||||
.clickOnSearchIcon()
|
||||
|
||||
.checkSearchBarIsVisible()
|
||||
|
||||
.enterText(folderName)
|
||||
|
||||
.resultTableContainsRow(folderName)
|
||||
|
||||
.clickOnSpecificRow(folderName);
|
||||
navigationBarPage.openContentServicesFolder(siteFolder.entry.id);
|
||||
|
||||
contentServicesPage.checkContentIsDisplayed('Site' + fileModel.name);
|
||||
|
||||
@@ -349,21 +247,7 @@ describe('Permissions Component', function () {
|
||||
|
||||
loginPage.loginToContentServicesUsingUserModel(contributorUser);
|
||||
|
||||
contentServicesPage.goToDocumentList();
|
||||
|
||||
searchDialog
|
||||
|
||||
.checkSearchIconIsVisible()
|
||||
|
||||
.clickOnSearchIcon()
|
||||
|
||||
.checkSearchBarIsVisible()
|
||||
|
||||
.enterText(folderName)
|
||||
|
||||
.resultTableContainsRow(folderName)
|
||||
|
||||
.clickOnSpecificRow(folderName);
|
||||
navigationBarPage.openContentServicesFolder(siteFolder.entry.id);
|
||||
|
||||
contentServicesPage.checkContentIsDisplayed('Site' + fileModel.name);
|
||||
|
||||
@@ -397,21 +281,7 @@ describe('Permissions Component', function () {
|
||||
|
||||
loginPage.loginToContentServicesUsingUserModel(collaboratorUser);
|
||||
|
||||
contentServicesPage.goToDocumentList();
|
||||
|
||||
searchDialog
|
||||
|
||||
.checkSearchIconIsVisible()
|
||||
|
||||
.clickOnSearchIcon()
|
||||
|
||||
.checkSearchBarIsVisible()
|
||||
|
||||
.enterText(folderName)
|
||||
|
||||
.resultTableContainsRow(folderName)
|
||||
|
||||
.clickOnSpecificRow(folderName);
|
||||
navigationBarPage.openContentServicesFolder(siteFolder.entry.id);
|
||||
|
||||
contentServicesPage.checkContentIsDisplayed('Site' + fileModel.name);
|
||||
|
||||
@@ -460,35 +330,16 @@ describe('Permissions Component', function () {
|
||||
});
|
||||
|
||||
it('[C277006] Role SiteManager', () => {
|
||||
|
||||
loginPage.loginToContentServicesUsingUserModel(managerUser);
|
||||
|
||||
contentServicesPage.goToDocumentList();
|
||||
|
||||
searchDialog
|
||||
|
||||
.checkSearchIconIsVisible()
|
||||
|
||||
.clickOnSearchIcon()
|
||||
|
||||
.checkSearchBarIsVisible()
|
||||
|
||||
.enterText(folderName)
|
||||
|
||||
.resultTableContainsRow(folderName)
|
||||
|
||||
.clickOnSpecificRow(folderName);
|
||||
|
||||
navigationBarPage.openContentServicesFolder(siteFolder.entry.id);
|
||||
contentServicesPage.checkContentIsDisplayed('Site' + fileModel.name);
|
||||
|
||||
contentList.doubleClickRow('Site' + fileModel.name);
|
||||
|
||||
viewerPage.checkFileIsLoaded();
|
||||
|
||||
viewerPage.clickCloseButton();
|
||||
|
||||
contentList.waitForTableBody();
|
||||
|
||||
contentServicesPage.metadataContent('Site' + fileModel.name);
|
||||
|
||||
metadataViewPage.editIconIsDisplayed();
|
||||
@@ -498,9 +349,7 @@ describe('Permissions Component', function () {
|
||||
await metadataViewPage.editIconClick();
|
||||
|
||||
metadataViewPage.editPropertyIconIsDisplayed('properties.cm:description');
|
||||
|
||||
metadataViewPage.clickEditPropertyIcons('properties.cm:description');
|
||||
|
||||
metadataViewPage.enterDescriptionText('newDescription');
|
||||
|
||||
await metadataViewPage.clickUpdatePropertyIcon('properties.cm:description');
|
||||
@@ -508,81 +357,18 @@ describe('Permissions Component', function () {
|
||||
expect(metadataViewPage.getPropertyText('properties.cm:description')).toEqual('newDescription');
|
||||
|
||||
metadataViewPage.clickCloseButton();
|
||||
|
||||
contentServicesPage.uploadFile(testFileModel.location).checkContentIsDisplayed(testFileModel.name);
|
||||
|
||||
uploadDialog.fileIsUploaded(testFileModel.name);
|
||||
|
||||
uploadDialog.clickOnCloseButton().dialogIsNotDisplayed();
|
||||
|
||||
contentServicesPage.checkContentIsDisplayed('Site' + fileModel.name);
|
||||
|
||||
contentServicesPage.deleteContent('Site' + fileModel.name);
|
||||
|
||||
contentServicesPage.checkContentIsNotDisplayed('Site' + fileModel.name);
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('Site Consumer - Add new version', function () {
|
||||
|
||||
it('[C277118] Should be able to add new version with Site Consumer permission on file', () => {
|
||||
|
||||
loginPage.loginToContentServicesUsingUserModel(managerUser);
|
||||
|
||||
browser.get(TestConfig.adf.url + '/files/' + privateSite.entry.guid);
|
||||
|
||||
contentServicesPage.checkContentIsDisplayed('privateSite' + fileModel.name);
|
||||
|
||||
contentList.doubleClickRow('privateSite' + fileModel.name);
|
||||
|
||||
viewerPage.checkFileIsLoaded();
|
||||
|
||||
viewerPage.checkInfoButtonIsDisplayed();
|
||||
|
||||
viewerPage.clickInfoButton();
|
||||
|
||||
viewerPage.checkInfoSideBarIsDisplayed();
|
||||
|
||||
viewerPage.clickMoveRightChevron();
|
||||
|
||||
viewerPage.clickMoveRightChevron();
|
||||
|
||||
viewerPage.clickOnTab('Versions');
|
||||
|
||||
viewerPage.checkTabIsActive('Versions');
|
||||
|
||||
versionManagePage
|
||||
|
||||
.checkUploadNewVersionsButtonIsDisplayed()
|
||||
|
||||
.clickAddNewVersionsButton()
|
||||
|
||||
.checkMajorChangeIsDisplayed()
|
||||
|
||||
.checkMinorChangeIsDisplayed()
|
||||
|
||||
.checkCommentTextIsDisplayed()
|
||||
|
||||
.checkCancelButtonIsDisplayed();
|
||||
|
||||
versionManagePage.uploadNewVersionFile(pngFileModel.location);
|
||||
|
||||
versionManagePage.checkFileVersionExist('1.0');
|
||||
|
||||
expect(versionManagePage.getFileVersionName('1.0')).toEqual('privateSite' + fileModel.name);
|
||||
|
||||
versionManagePage.checkFileVersionExist('1.1');
|
||||
|
||||
expect(versionManagePage.getFileVersionName('1.1')).toEqual(pngFileModel.name);
|
||||
|
||||
viewerPage.checkFileNameIsDisplayed(pngFileModel.name);
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user