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

61
e2e/core/viewer/viewer-content-services-component.e2e.ts
View File

@@ -15,23 +15,17 @@
* limitations under the License.
*/
import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../../actions/ACS/upload.actions';
import { browser } from 'protractor';
describe('Content Services Viewer', () => {
const originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
import { LoginPage, UploadActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
describe('Content Services Viewer', () => {
const acsUser = new AcsUserModel();
const viewerPage = new ViewerPage();
const contentServicesPage = new ContentServicesPage();
@@ -74,14 +68,13 @@ describe('Content Services Viewer', () => {
'name': resources.Files.ADF_DOCUMENTS.PPT.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.PPT.first_page_text
});
beforeAll(async (done) => {
const uploadActions = new UploadActions();
this.alfrescoJsApi = new AlfrescoApi({
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: browser.params.testConfig.adf.url
});
const uploadActions = new UploadActions(this.alfrescoJsApi);
beforeAll(async (done) => {
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
@@ -89,25 +82,25 @@ describe('Content Services Viewer', () => {
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
const pdfFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFile.location, pdfFile.name, '-my-');
const pdfFileUploaded = await uploadActions.uploadFile(pdfFile.location, pdfFile.name, '-my-');
Object.assign(pdfFile, pdfFileUploaded.entry);
const protectedFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, protectedFile.location, protectedFile.name, '-my-');
const protectedFileUploaded = await uploadActions.uploadFile(protectedFile.location, protectedFile.name, '-my-');
Object.assign(protectedFile, protectedFileUploaded.entry);
const docxFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, docxFile.location, docxFile.name, '-my-');
const docxFileUploaded = await uploadActions.uploadFile(docxFile.location, docxFile.name, '-my-');
Object.assign(docxFile, docxFileUploaded.entry);
const jpgFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, jpgFile.location, jpgFile.name, '-my-');
const jpgFileUploaded = await uploadActions.uploadFile(jpgFile.location, jpgFile.name, '-my-');
Object.assign(jpgFile, jpgFileUploaded.entry);
const mp4FileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, mp4File.location, mp4File.name, '-my-');
const mp4FileUploaded = await uploadActions.uploadFile(mp4File.location, mp4File.name, '-my-');
Object.assign(mp4File, mp4FileUploaded.entry);
const pptFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, pptFile.location, pptFile.name, '-my-');
const pptFileUploaded = await uploadActions.uploadFile(pptFile.location, pptFile.name, '-my-');
Object.assign(pptFile, pptFileUploaded.entry);
const unsupportedFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, unsupportedFile.location, unsupportedFile.name, '-my-');
const unsupportedFileUploaded = await uploadActions.uploadFile(unsupportedFile.location, unsupportedFile.name, '-my-');
Object.assign(unsupportedFile, unsupportedFileUploaded.entry);
await loginPage.loginToContentServicesUsingUserModel(acsUser);
@@ -118,16 +111,14 @@ describe('Content Services Viewer', () => {
});
afterAll(async (done) => {
const uploadActions = new UploadActions();
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pdfFile.getId());
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, protectedFile.getId());
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, docxFile.getId());
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, jpgFile.getId());
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, mp4File.getId());
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pptFile.getId());
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, unsupportedFile.getId());
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
await uploadActions.deleteFileOrFolder(pdfFile.getId());
await uploadActions.deleteFileOrFolder(protectedFile.getId());
await uploadActions.deleteFileOrFolder(docxFile.getId());
await uploadActions.deleteFileOrFolder(jpgFile.getId());
await uploadActions.deleteFileOrFolder(mp4File.getId());
await uploadActions.deleteFileOrFolder(pptFile.getId());
await uploadActions.deleteFileOrFolder(unsupportedFile.getId());
done();
});