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

[ADF-4515] Removing duplicated test and moving other test to the right spec (#4872)

Browse Source
This commit is contained in:
Marouan Bentaleb 2019-06-24 18:43:33 +02:00 committed by Eugenio Romano
parent 317ae3db68
commit 31d98fc368
2 changed files with 24 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
e2e/content-services/upload/remove-upload.e2e.ts
View File

@ -1,93 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { LoginPage, BrowserActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
describe('Upload component', () => {
const contentServicesPage = new ContentServicesPage();
const uploadDialog = new UploadDialog();
const versionManagePage = new VersionManagePage();
const loginPage = new LoginPage();
const acsUser = new AcsUserModel();
const docxFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
location: resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location
});
const fileModelVersion = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location
});
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(
browser.params.testConfig.adf.adminEmail,
browser.params.testConfig.adf.adminPassword
);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
done();
});
it('should remove uploaded file', () => {
contentServicesPage.goToDocumentList();
contentServicesPage.uploadFile(docxFileModel.location);
uploadDialog.fileIsUploaded(docxFileModel.name);
uploadDialog
.removeUploadedFile(docxFileModel.name)
.fileIsCancelled(docxFileModel.name)
.clickOnCloseButton();
});
it('should not have remove action if uploaded file is a file version', () => {
contentServicesPage.goToDocumentList();
contentServicesPage.uploadFile(docxFileModel.location);
uploadDialog.fileIsUploaded(docxFileModel.name);
contentServicesPage.checkContentIsDisplayed(docxFileModel.name);
contentServicesPage.versionManagerContent(docxFileModel.name);
BrowserActions.click(versionManagePage.showNewVersionButton);
versionManagePage.uploadNewVersionFile(
fileModelVersion.location
);
versionManagePage.closeVersionDialog();
uploadDialog.removeUploadedFile(fileModelVersion.name);
contentServicesPage.checkContentIsDisplayed(fileModelVersion.name);
});
});

33
e2e/content-services/upload/upload-dialog.ts
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { LoginPage, UploadActions } from '@alfresco/adf-testing'; import { BrowserActions, LoginPage, UploadActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
@ -24,6 +24,7 @@ import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources'); import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { VersionManagePage } from '../../pages/adf/versionManagerPage';
describe('Upload component', () => { describe('Upload component', () => {
@ -32,6 +33,7 @@ describe('Upload component', () => {
const uploadToggles = new UploadToggles(); const uploadToggles = new UploadToggles();
const loginPage = new LoginPage(); const loginPage = new LoginPage();
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const versionManagePage = new VersionManagePage();
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
hostEcm: browser.params.testConfig.adf.url hostEcm: browser.params.testConfig.adf.url
@ -78,15 +80,15 @@ describe('Upload component', () => {
}); });
afterEach(async (done) => { afterEach(async (done) => {
const nodesPromise = await contentServicesPage.getElementsDisplayedId(); const nbResults = await contentServicesPage.numberOfResultsDisplayed();
if (nbResults > 1) {
const nodesPromise = await contentServicesPage.getElementsDisplayedId();
nodesPromise.forEach(async (currentNodePromise) => { nodesPromise.forEach(async (currentNodePromise) => {
await currentNodePromise.then(async (currentNode) => { const nodeId = await currentNodePromise;
if (currentNode && currentNode !== 'Node id') { await uploadActions.deleteFileOrFolder(nodeId);
await uploadActions.deleteFileOrFolder(currentNode);
}
}); });
}); }
done(); done();
}); });
@ -140,7 +142,6 @@ describe('Upload component', () => {
}); });
it('[C260170] Should be possible to upload multiple files', () => { it('[C260170] Should be possible to upload multiple files', () => {
contentServicesPage.goToDocumentList();
contentServicesPage.checkAcsContainer(); contentServicesPage.checkAcsContainer();
uploadToggles.enableMultipleFileUpload(); uploadToggles.enableMultipleFileUpload();
contentServicesPage.uploadMultipleFile(filesLocation).checkContentsAreDisplayed(filesName); contentServicesPage.uploadMultipleFile(filesLocation).checkContentsAreDisplayed(filesName);
@ -150,4 +151,18 @@ describe('Upload component', () => {
uploadToggles.disableMultipleFileUpload(); uploadToggles.disableMultipleFileUpload();
}); });
it('[C311305] Should NOT be able to remove uploaded version', () => {
contentServicesPage.uploadFile(docxFileModel.location);
uploadDialog.fileIsUploaded(docxFileModel.name);
contentServicesPage.checkContentIsDisplayed(docxFileModel.name);
contentServicesPage.versionManagerContent(docxFileModel.name);
BrowserActions.click(versionManagePage.showNewVersionButton);
versionManagePage.uploadNewVersionFile(
pngFileModel.location
);
versionManagePage.closeVersionDialog();
uploadDialog.removeUploadedFile(pngFileModel.name);
contentServicesPage.checkContentIsDisplayed(pngFileModel.name);
});
}); });