inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4909] e2e - Move the resources as part of protractor params (#5086)

Browse Source 
* Move the resources as part of protractor params

* Revert replace mistakes

* Remove the resources imports

* fix resources import
This commit is contained in:
Maurizio Vitale
2019-10-10 10:22:11 +01:00
committed by Eugenio Romano
parent 6860ab73ab
commit 3fc9390666
129 changed files with 421 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/content-services/comments/comment-component.e2e.ts
+2 -3
View File
@@ -23,7 +23,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -39,8 +38,8 @@ describe('Comment Component', () => {
let userFullName, nodeId; let userFullName, nodeId;
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
e2e/content-services/directives/download-directive.e2e.ts
+7 -8
View File
@@ -20,7 +20,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { LoginPage, UploadActions, BrowserVisibility, FileBrowserUtil } from '@alfresco/adf-testing'; import { LoginPage, UploadActions, BrowserVisibility, FileBrowserUtil } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { FolderModel } from '../../models/ACS/folderModel'; import { FolderModel } from '../../models/ACS/folderModel';
@@ -36,27 +35,27 @@ describe('Version component actions', () => {
const txtFileComma = new FileModel({ const txtFileComma = new FileModel({
name: 'comma,name', name: 'comma,name',
location: resources.Files.ADF_DOCUMENTS.TXT.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
}); });
const txtFileModel = new FileModel({ const txtFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TXT.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
location: resources.Files.ADF_DOCUMENTS.TXT.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
}); });
const file0BytesModel = new FileModel({ const file0BytesModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
const folderInfo = new FolderModel({ const folderInfo = new FolderModel({
name: 'myFolder', name: 'myFolder',
location: resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
}); });
const folderSecond = new FolderModel({ const folderSecond = new FolderModel({
name: 'myrSecondFolder', name: 'myrSecondFolder',
location: resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
e2e/content-services/directives/edit-folder-directive.e2e.ts
+2 -3
View File
@@ -23,7 +23,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser, protractor } from 'protractor'; import { browser, protractor } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
describe('Edit folder directive', () => { describe('Edit folder directive', () => {
@@ -41,8 +40,8 @@ describe('Edit folder directive', () => {
}); });
const pdfFile = new FileModel({ const pdfFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
e2e/content-services/directives/favorite-directive.e2e.ts
+2 -3
View File
@@ -22,7 +22,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage'; import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage';
import { TrashcanPage } from '../../pages/adf/trashcanPage'; import { TrashcanPage } from '../../pages/adf/trashcanPage';
@@ -43,8 +42,8 @@ describe('Favorite directive', () => {
hostEcm: browser.params.testConfig.adf_acs.host hostEcm: browser.params.testConfig.adf_acs.host
}); });
const pdfFile = new FileModel({ const pdfFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
e2e/content-services/directives/restore-content-directive.e2e.ts
+6 -7
View File
@@ -21,7 +21,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { TrashcanPage } from '../../pages/adf/trashcanPage'; import { TrashcanPage } from '../../pages/adf/trashcanPage';
import { LoginPage, NotificationHistoryPage, StringUtil, UploadActions, BrowserActions } from '@alfresco/adf-testing'; import { LoginPage, NotificationHistoryPage, StringUtil, UploadActions, BrowserActions } from '@alfresco/adf-testing';
@@ -44,18 +43,18 @@ describe('Restore content directive', () => {
}); });
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const testFileModel = new FileModel({ const testFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const folderName = StringUtil.generateRandomString(5); const folderName = StringUtil.generateRandomString(5);
e2e/content-services/document-list/document-list-actions.e2e.ts
+4 -5
View File
@@ -26,7 +26,6 @@ import {
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { Util } from '../../util/util'; import { Util } from '../../util/util';
@@ -62,12 +61,12 @@ describe('Document List Component - Actions', () => {
const nrOfFiles = 5; const nrOfFiles = 5;
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const testFileModel = new FileModel({ const testFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const files = { const files = {
e2e/content-services/document-list/document-list-component.e2e.ts
+19 -20
View File
@@ -19,7 +19,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { ViewerPage } from '../../pages/adf/viewerPage'; import { ViewerPage } from '../../pages/adf/viewerPage';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
@@ -63,20 +62,20 @@ describe('Document List Component', () => {
let folderName; let folderName;
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const docxFileModel = new FileModel({ const docxFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.DOCX.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name,
location: resources.Files.ADF_DOCUMENTS.DOCX.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location
}); });
const timeAgoFileModel = new FileModel({ const timeAgoFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const mediumFileModel = new FileModel({ const mediumFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF_B.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF_B.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location
}); });
let pdfUploadedNode, docxUploadedNode, timeAgoUploadedNode, mediumDateUploadedNode; let pdfUploadedNode, docxUploadedNode, timeAgoUploadedNode, mediumDateUploadedNode;
@@ -163,17 +162,17 @@ describe('Document List Component', () => {
const fakeFileA = new FileModel({ const fakeFileA = new FileModel({
name: 'A', name: 'A',
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const fakeFileB = new FileModel({ const fakeFileB = new FileModel({
name: 'B', name: 'B',
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const fakeFileC = new FileModel({ const fakeFileC = new FileModel({
name: 'C', name: 'C',
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
let fileANode, fileBNode, fileCNode; let fileANode, fileBNode, fileCNode;
@@ -252,8 +251,8 @@ describe('Document List Component', () => {
it('[C272775] Should be able to upload a file in new folder', async () => { it('[C272775] Should be able to upload a file in new folder', async () => {
const testFile = new FileModel({ const testFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
acsUser = new AcsUserModel(); acsUser = new AcsUserModel();
/* cspell:disable-next-line */ /* cspell:disable-next-line */
@@ -306,12 +305,12 @@ describe('Document List Component', () => {
it('[C269086] Should display Islocked field for files', async () => { it('[C269086] Should display Islocked field for files', async () => {
const testFileA = new FileModel({ const testFileA = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const testFileB = new FileModel({ const testFileB = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF_B.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF_B.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location
}); });
acsUser = new AcsUserModel(); acsUser = new AcsUserModel();
await this.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);
@@ -365,8 +364,8 @@ describe('Document List Component', () => {
describe('Column Template', () => { describe('Column Template', () => {
const file0BytesModel = new FileModel({ const file0BytesModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
let file; let file;
e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts
+4 -5
View File
@@ -26,7 +26,6 @@ import {
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
@@ -50,13 +49,13 @@ describe('Document List Component', () => {
let folderName, sameNameFolder; let folderName, sameNameFolder;
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const testFileModel = new FileModel({ const testFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/document-list/document-list-gallery.e2e.ts
+6 -7
View File
@@ -18,7 +18,6 @@
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
@@ -49,18 +48,18 @@ describe('Document List Component', () => {
let funnyUser; let funnyUser;
const pdfFile = new FileModel({ const pdfFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const testFile = new FileModel({ const testFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const docxFile = new FileModel({ const docxFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.DOCX.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name,
location: resources.Files.ADF_DOCUMENTS.DOCX.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location
}); });
const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
let filePdfNode, fileTestNode, fileDocxNode, folderNode, filePDFSubNode; let filePdfNode, fileTestNode, fileDocxNode, folderNode, filePDFSubNode;
e2e/content-services/document-list/document-list-properties.e2e.ts
+2 -3
View File
@@ -20,7 +20,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { DropActions } from '../../actions/drop.actions'; import { DropActions } from '../../actions/drop.actions';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
@@ -40,8 +39,8 @@ describe('Document List Component - Properties', () => {
let acsUser = null; let acsUser = null;
const pngFile = new FileModel({ const pngFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
describe('Allow drop files property', () => { describe('Allow drop files property', () => {
e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts
+6 -7
View File
@@ -18,7 +18,6 @@
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
@@ -62,18 +61,18 @@ describe('Document List Component', () => {
describe('Thumbnails and tooltips', () => { describe('Thumbnails and tooltips', () => {
const pdfFile = new FileModel({ const pdfFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PDF.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
location: resources.Files.ADF_DOCUMENTS.PDF.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const testFile = new FileModel({ const testFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const docxFile = new FileModel({ const docxFile = new FileModel({
name: resources.Files.ADF_DOCUMENTS.DOCX.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name,
location: resources.Files.ADF_DOCUMENTS.DOCX.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location
}); });
const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
let filePdfNode, fileTestNode, fileDocxNode, folderNode; let filePdfNode, fileTestNode, fileDocxNode, folderNode;
e2e/content-services/lock-file.e2e.ts
+4 -5
View File
@@ -23,7 +23,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FileModel } from '../models/ACS/fileModel'; import { FileModel } from '../models/ACS/fileModel';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
describe('Lock File', () => { describe('Lock File', () => {
@@ -41,13 +40,13 @@ describe('Lock File', () => {
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const pngFileToLock = new FileModel({ const pngFileToLock = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG_B.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG_B.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location
}); });
let nodeId, site, documentLibrary, lockedFileNodeId; let nodeId, site, documentLibrary, lockedFileNodeId;
e2e/content-services/metadata/aspect-oriented-config.e2e.ts
+2 -6
View File
@@ -19,13 +19,9 @@ import { LoginPage, UploadActions, LocalStorageUtil } from '@alfresco/adf-testin
import { ViewerPage } from '../../pages/adf/viewerPage'; import { ViewerPage } from '../../pages/adf/viewerPage';
import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { check } from '../../util/material'; import { check } from '../../util/material';
@@ -43,8 +39,8 @@ describe('Aspect oriented config', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
let uploadActions; let uploadActions;
e2e/content-services/metadata/metadata-permissions.e2e.ts
+2 -3
View File
@@ -22,7 +22,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');
@@ -52,8 +51,8 @@ describe('permissions', () => {
let site; let site;
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
e2e/content-services/metadata/metadata-properties.e2e.ts
+2 -3
View File
@@ -21,7 +21,6 @@ import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { check, uncheck } from '../../util/material'; import { check, uncheck } from '../../util/material';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -51,8 +50,8 @@ describe('CardView Component - properties', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
e2e/content-services/metadata/metadata-smoke-tests.e2e.ts
+5 -9
View File
@@ -19,14 +19,10 @@ import { LoginPage, LocalStorageUtil, BrowserActions, UploadActions } from '@alf
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage'; import { ViewerPage } from '../../pages/adf/viewerPage';
import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import dateFormat = require('dateformat'); import dateFormat = require('dateformat');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -56,8 +52,8 @@ describe('Metadata component', () => {
const folderName = 'Metadata Folder'; const folderName = 'Metadata Folder';
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
@@ -176,7 +172,7 @@ describe('Metadata component', () => {
await metadataViewPage.enterPropertyText('name', 'exampleText'); await metadataViewPage.enterPropertyText('name', 'exampleText');
await metadataViewPage.clickClearPropertyIcon('name'); await metadataViewPage.clickClearPropertyIcon('name');
await expect(await metadataViewPage.getPropertyText('name')).toEqual(resources.Files.ADF_DOCUMENTS.PNG.file_name); await expect(await metadataViewPage.getPropertyText('name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name);
await metadataViewPage.clickEditPropertyIcons('name'); await metadataViewPage.clickEditPropertyIcons('name');
await metadataViewPage.enterPropertyText('name', 'exampleText.png'); await metadataViewPage.enterPropertyText('name', 'exampleText.png');
@@ -208,9 +204,9 @@ describe('Metadata component', () => {
await metadataViewPage.editIconClick(); await metadataViewPage.editIconClick();
await metadataViewPage.clickEditPropertyIcons('name'); await metadataViewPage.clickEditPropertyIcons('name');
await metadataViewPage.enterPropertyText('name', resources.Files.ADF_DOCUMENTS.PNG.file_name); await metadataViewPage.enterPropertyText('name', browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name);
await metadataViewPage.clickUpdatePropertyIcon('name'); await metadataViewPage.clickUpdatePropertyIcon('name');
await expect(await metadataViewPage.getPropertyText('name')).toEqual(resources.Files.ADF_DOCUMENTS.PNG.file_name); await expect(await metadataViewPage.getPropertyText('name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name);
}); });
it('[C260181] Should be possible edit all the metadata aspect', async () => { it('[C260181] Should be possible edit all the metadata aspect', async () => {
e2e/content-services/permissions/permissions-component.e2e.ts
+6 -7
View File
@@ -18,7 +18,6 @@
import { PermissionsPage } from '../../pages/adf/permissionsPage'; import { PermissionsPage } from '../../pages/adf/permissionsPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { StringUtil, BrowserActions, NotificationHistoryPage, LoginPage, UploadActions } from '@alfresco/adf-testing'; import { StringUtil, BrowserActions, NotificationHistoryPage, LoginPage, UploadActions } from '@alfresco/adf-testing';
@@ -48,18 +47,18 @@ describe('Permissions Component', () => {
const uploadDialog = new UploadDialog(); const uploadDialog = new UploadDialog();
let fileOwnerUser, filePermissionUser, file; let fileOwnerUser, filePermissionUser, file;
const fileModel = new FileModel({ const fileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
const testFileModel = new FileModel({ const testFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const groupBody = { const groupBody = {
e2e/content-services/permissions/site-permissions.e2e.ts
+6 -7
View File
@@ -19,7 +19,6 @@ import { PermissionsPage } from '../../pages/adf/permissionsPage';
import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing'; import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
@@ -53,18 +52,18 @@ describe('Permissions Component', () => {
let publicSite, privateSite, folderName; let publicSite, privateSite, folderName;
const fileModel = new FileModel({ const fileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
location: resources.Files.ADF_DOCUMENTS.TXT_0B.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
const testFileModel = new FileModel({ const testFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.TEST.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
location: resources.Files.ADF_DOCUMENTS.TEST.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
let siteFolder, privateSiteFile; let siteFolder, privateSiteFile;
e2e/content-services/share-file/share-file.e2e.ts
+2 -3
View File
@@ -29,7 +29,6 @@ import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
describe('Share file', () => { describe('Share file', () => {
@@ -48,8 +47,8 @@ describe('Share file', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
let nodeId; let nodeId;
e2e/content-services/share-file/unshare-file.e2e.ts
+2 -3
View File
@@ -29,7 +29,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor'; import { browser } from 'protractor';
@@ -55,8 +54,8 @@ describe('Unshare file', () => {
let nodeId; let nodeId;
let testSite; let testSite;
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
name: resources.Files.ADF_DOCUMENTS.PNG.file_name, name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
location: resources.Files.ADF_DOCUMENTS.PNG.file_location location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/social/social.component.e2e.ts
+2 -3
View File
@@ -19,7 +19,6 @@ import { LoginPage, LikePage, RatePage, UploadActions } from '@alfresco/adf-test
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { SocialPage } from '../../pages/adf/demo-shell/socialPage'; import { SocialPage } from '../../pages/adf/demo-shell/socialPage';
import { browser } from 'protractor'; import { browser } from 'protractor';
@@ -48,8 +47,8 @@ describe('Social component', () => {
let emptyFile; let emptyFile;
const emptyFileModel = new FileModel({ const emptyFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/sso/sso-download-directive-component.e2e.ts
+4 -5
View File
@@ -30,7 +30,6 @@ import {
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { ViewerPage } from '../../pages/adf/viewerPage'; import { ViewerPage } from '../../pages/adf/viewerPage';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList, implicitFlow true', () => { describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList, implicitFlow true', () => {
@@ -45,13 +44,13 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
let implicitFlow; let implicitFlow;
const firstPdfFileModel = new FileModel({ const firstPdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
let pdfUploadedFile, pngUploadedFile, folder; let pdfUploadedFile, pngUploadedFile, folder;
e2e/content-services/tag-component.e2e.ts
+1 -2
View File
@@ -20,7 +20,6 @@ import { FileModel } from '../models/ACS/fileModel';
import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { TagPage } from '../pages/adf/tagPage'; import { TagPage } from '../pages/adf/tagPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor'; import { browser } from 'protractor';
@@ -36,7 +35,7 @@ describe('Tag component', () => {
hostEcm: browser.params.testConfig.adf_acs.host hostEcm: browser.params.testConfig.adf_acs.host
}); });
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
const pdfFileModel = new FileModel({ name: resources.Files.ADF_DOCUMENTS.PDF.file_name }); const pdfFileModel = new FileModel({ name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name });
const deleteFile = new FileModel({ name: StringUtil.generateRandomString() }); const deleteFile = new FileModel({ name: StringUtil.generateRandomString() });
const sameTag = StringUtil.generateRandomString().toLowerCase(); const sameTag = StringUtil.generateRandomString().toLowerCase();
e2e/content-services/upload/cancel-upload.e2e.ts
+6 -7
View File
@@ -22,7 +22,6 @@ import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -41,16 +40,16 @@ describe('Upload component', async () => {
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const firstPdfFileModel = new FileModel({ const firstPdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const largeFile = new FileModel({ const largeFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name,
'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/upload/excluded-file.e2e.ts
+6 -11
View File
@@ -16,17 +16,12 @@
*/ */
import { element, by, browser } from 'protractor'; import { element, by, browser } from 'protractor';
import { LoginPage, LocalStorageUtil } from '@alfresco/adf-testing'; import { LoginPage, LocalStorageUtil } 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';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { DropActions } from '../../actions/drop.actions'; import { DropActions } from '../../actions/drop.actions';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -41,18 +36,18 @@ describe('Upload component - Excluded Files', () => {
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const iniExcludedFile = new FileModel({ const iniExcludedFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.INI.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.INI.file_name,
'location': resources.Files.ADF_DOCUMENTS.INI.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.INI.file_location
}); });
const txtFileModel = new FileModel({ const txtFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
const pngFile = new FileModel({ const pngFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/upload/upload-dialog.e2e.ts
+10 -11
View File
@@ -22,7 +22,6 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
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'; import { VersionManagePage } from '../../pages/adf/versionManagerPage';
@@ -41,24 +40,24 @@ describe('Upload component', () => {
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
const firstPdfFileModel = new FileModel({ const firstPdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location
}); });
const docxFileModel = new FileModel({ const docxFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name,
'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location
}); });
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const pngFileModelTwo = new FileModel({ const pngFileModelTwo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location]; const filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location];
const filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name]; const filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name];
e2e/content-services/upload/upload-dialog.ts
+10 -14
View File
@@ -22,7 +22,6 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
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'; import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -44,30 +43,29 @@ describe('Upload component', () => {
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
const firstPdfFileModel = new FileModel({ const firstPdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location
}); });
const docxFileModel = new FileModel({ const docxFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name,
'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location
}); });
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const pngFileModelTwo = new FileModel({ const pngFileModelTwo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location]; const filesLocation = [pdfFileModel.location, docxFileModel.location, pngFileModel.location, firstPdfFileModel.location];
const filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name]; const filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name];
beforeAll(async () => { beforeAll(async () => {
await this.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(acsUser); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await this.alfrescoJsApi.login(acsUser.id, acsUser.password); await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
@@ -75,12 +73,10 @@ describe('Upload component', () => {
await contentServicesPage.goToDocumentList(); await contentServicesPage.goToDocumentList();
const pdfUploadedFile = await uploadActions.uploadFile(firstPdfFileModel.location, firstPdfFileModel.name, '-my-'); const pdfUploadedFile = await uploadActions.uploadFile(firstPdfFileModel.location, firstPdfFileModel.name, '-my-');
Object.assign(firstPdfFileModel, pdfUploadedFile.entry); Object.assign(firstPdfFileModel, pdfUploadedFile.entry);
}); });
afterAll(async () => { afterAll(async () => {
await navigationBarPage.clickLogoutButton(); await navigationBarPage.clickLogoutButton();
}); });
beforeEach(async () => { beforeEach(async () => {
e2e/content-services/upload/uploader-component.e2e.ts
+12 -20
View File
@@ -23,7 +23,6 @@ import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { DropActions } from '../../actions/drop.actions'; import { DropActions } from '../../actions/drop.actions';
@@ -43,44 +42,37 @@ describe('Upload component', () => {
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const firstPdfFileModel = new FileModel({ const firstPdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_location
}); });
const docxFileModel = new FileModel({ const docxFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.DOCX.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_name,
'location': resources.Files.ADF_DOCUMENTS.DOCX.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX.file_location
}); });
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const pngFileModel = new FileModel({ const pngFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const fileWithSpecificSize = new FileModel({ const fileWithSpecificSize = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT_400B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_400B.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT_400B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_400B.file_location
}); });
const emptyFile = new FileModel({ const emptyFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
await this.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(acsUser); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await this.alfrescoJsApi.login(acsUser.id, acsUser.password); await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
await loginPage.loginToContentServicesUsingUserModel(acsUser); await loginPage.loginToContentServicesUsingUserModel(acsUser);
const pdfUploadedFile = await uploadActions.uploadFile(firstPdfFileModel.location, firstPdfFileModel.name, '-my-'); const pdfUploadedFile = await uploadActions.uploadFile(firstPdfFileModel.location, firstPdfFileModel.name, '-my-');
Object.assign(firstPdfFileModel, pdfUploadedFile.entry); Object.assign(firstPdfFileModel, pdfUploadedFile.entry);
}); });
afterAll(async () => { afterAll(async () => {
e2e/content-services/upload/user-permission.e2e.ts
+6 -12
View File
@@ -16,19 +16,13 @@
*/ */
import { browser } from 'protractor'; import { browser } from 'protractor';
import { StringUtil, LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing'; import { StringUtil, LoginPage, NotificationHistoryPage } 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 { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Upload - User permission', () => { describe('Upload - User permission', () => {
@@ -42,18 +36,18 @@ describe('Upload - User permission', () => {
const notificationHistoryPage = new NotificationHistoryPage(); const notificationHistoryPage = new NotificationHistoryPage();
const emptyFile = new FileModel({ const emptyFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
const pngFile = new FileModel({ const pngFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const pdfFile = new FileModel({ const pdfFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/version/version-actions.e2e.ts
+6 -11
View File
@@ -16,16 +16,11 @@
*/ */
import { browser, by, element } from 'protractor'; import { browser, by, element } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing'; import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '@alfresco/adf-testing'; import { UploadActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -43,19 +38,19 @@ describe('Version component actions', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const txtFileModel = new FileModel({ const txtFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
}); });
const fileModelVersionTwo = new FileModel({ const fileModelVersionTwo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
}); });
let uploadActions; let uploadActions;
const bigFileToCancel = new FileModel({ const bigFileToCancel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name,
'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/version/version-permissions.e2e.ts
+13 -16
View File
@@ -15,8 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { element, by } from 'protractor'; import { element, by, browser } from 'protractor';
import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing'; import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage';
@@ -24,8 +23,6 @@ import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NodeActions } from '../../actions/ACS/node.actions'; import { NodeActions } from '../../actions/ACS/node.actions';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');
@@ -48,18 +45,18 @@ describe('Version component permissions', () => {
const fileCreatorUser = new AcsUserModel(); const fileCreatorUser = new AcsUserModel();
const newVersionFile = new FileModel({ const newVersionFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location
}); });
const lockFileModel = new FileModel({ const lockFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_C.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_C.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_location
}); });
const differentCreatorFile = new FileModel({ const differentCreatorFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
@@ -122,8 +119,8 @@ describe('Version component permissions', () => {
describe('Manager', () => { describe('Manager', () => {
const sameCreatorFile = new FileModel({ const sameCreatorFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
@@ -197,8 +194,8 @@ describe('Version component permissions', () => {
describe('Contributor', () => { describe('Contributor', () => {
const sameCreatorFile = new FileModel({ const sameCreatorFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
@@ -253,8 +250,8 @@ describe('Version component permissions', () => {
describe('Collaborator', () => { describe('Collaborator', () => {
const sameCreatorFile = new FileModel({ const sameCreatorFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/content-services/version/version-properties.e2e.ts
+4 -5
View File
@@ -21,7 +21,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -35,13 +34,13 @@ describe('Version Properties', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const txtFileModel = new FileModel({ const txtFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT_0B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT_0B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT_0B.file_location
}); });
const fileModelVersionTwo = new FileModel({ const fileModelVersionTwo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
e2e/content-services/version/version-smoke-tests.e2e.ts
+13 -15
View File
@@ -16,13 +16,11 @@
*/ */
import { browser } from 'protractor'; import { browser } from 'protractor';
import { LoginPage, UploadActions, BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; import { LoginPage, UploadActions, BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -37,33 +35,33 @@ describe('Version component', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const txtFileModel = new FileModel({ const txtFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
}); });
const fileModelVersionTwo = new FileModel({ const fileModelVersionTwo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const fileModelVersionThree = new FileModel({ const fileModelVersionThree = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_B.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_location
}); });
const fileModelVersionFor = new FileModel({ const fileModelVersionFor = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_C.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_C.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_C.file_location
}); });
const fileModelVersionFive = new FileModel({ const fileModelVersionFive = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG_D.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG_D.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_D.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
hostEcm: browser.params.testConfig.adf_acs.host hostEcm: browser.params.testConfig.adf_acs.host
}); });
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
e2e/core/datatable/data-table-component.e2e.ts
+2 -4
View File
@@ -20,11 +20,9 @@ import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
import { DataTableComponentPage } from '@alfresco/adf-testing'; import { DataTableComponentPage } from '@alfresco/adf-testing';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { DropActions } from '../../actions/drop.actions'; import { DropActions } from '../../actions/drop.actions';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
describe('Datatable component', () => { describe('Datatable component', () => {
@@ -39,8 +37,8 @@ describe('Datatable component', () => {
const notificationHistoryPage = new NotificationHistoryPage(); const notificationHistoryPage = new NotificationHistoryPage();
const dragAndDrop = new DropActions(); const dragAndDrop = new DropActions();
const pngFile = new FileModel({ const pngFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/pagination-empty-current-page.e2e.ts
+2 -6
View File
@@ -19,16 +19,12 @@ import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../pages/adf/contentServicesPage';
import { PaginationPage } from '@alfresco/adf-testing'; import { PaginationPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../pages/adf/viewerPage'; import { ViewerPage } from '../pages/adf/viewerPage';
import { AcsUserModel } from '../models/ACS/acsUserModel'; import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FolderModel } from '../models/ACS/folderModel'; import { FolderModel } from '../models/ACS/folderModel';
import { FileModel } from '../models/ACS/fileModel'; import { FileModel } from '../models/ACS/fileModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '@alfresco/adf-testing'; import { UploadActions } from '@alfresco/adf-testing';
import { Util } from '../util/util'; import { Util } from '../util/util';
import resources = require('../util/resources');
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Pagination - returns to previous page when current is empty', () => { describe('Pagination - returns to previous page when current is empty', () => {
@@ -61,8 +57,8 @@ describe('Pagination - returns to previous page when current is empty', () => {
}; };
const pngFileInfo = new FileModel({ const pngFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/user-info-component.e2e.ts
+4 -9
View File
@@ -17,15 +17,10 @@
import { LoginPage } from '@alfresco/adf-testing'; import { LoginPage } from '@alfresco/adf-testing';
import { UserInfoPage } from '@alfresco/adf-testing'; import { UserInfoPage } from '@alfresco/adf-testing';
import { AcsUserModel } from '../models/ACS/acsUserModel'; import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FileModel } from '../models/ACS/fileModel'; import { FileModel } from '../models/ACS/fileModel';
import PeopleAPI = require('../restAPI/ACS/PeopleAPI'); import PeopleAPI = require('../restAPI/ACS/PeopleAPI');
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -38,12 +33,12 @@ describe('User Info component', () => {
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const acsAvatarFileModel = new FileModel({ const acsAvatarFileModel = new FileModel({
'name': resources.Files.PROFILE_IMAGES.ECM.file_name, 'name': browser.params.resources.Files.PROFILE_IMAGES.ECM.file_name,
'location': resources.Files.PROFILE_IMAGES.ECM.file_location 'location': browser.params.resources.Files.PROFILE_IMAGES.ECM.file_location
}); });
const apsAvatarFileModel = new FileModel({ const apsAvatarFileModel = new FileModel({
'name': resources.Files.PROFILE_IMAGES.BPM.file_name, 'name': browser.params.resources.Files.PROFILE_IMAGES.BPM.file_name,
'location': resources.Files.PROFILE_IMAGES.BPM.file_location 'location': browser.params.resources.Files.PROFILE_IMAGES.BPM.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts
+2 -4
View File
@@ -16,12 +16,10 @@
*/ */
import { browser } from 'protractor'; import { browser } from 'protractor';
import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants'); import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel'; import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -43,8 +41,8 @@ describe('Viewer', () => {
const uploadActions = new UploadActions(this.alfrescoJsApi); const uploadActions = new UploadActions(this.alfrescoJsApi);
const archiveFolderInfo = new FolderModel({ const archiveFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.ARCHIVE_FOLDER.folder_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/file-extensions/viewer-component.e2e.ts
+4 -5
View File
@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants'); import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FileModel } from '../../..//models/ACS/fileModel'; import { FileModel } from '../../..//models/ACS/fileModel';
import { FolderModel } from '../../../models/ACS/folderModel'; import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel';
@@ -44,13 +43,13 @@ describe('Viewer', () => {
let pngFileUploaded; let pngFileUploaded;
const pngFileInfo = new FileModel({ const pngFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const otherFolderInfo = new FolderModel({ const otherFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.OTHER_FOLDER.folder_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts
+2 -3
View File
@@ -20,7 +20,6 @@ import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants'); import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel'; import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -34,8 +33,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const excelFolderInfo = new FolderModel({ const excelFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.EXCEL_FOLDER.folder_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts
+4 -5
View File
@@ -20,7 +20,6 @@ import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants'); import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel'; import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -39,13 +38,13 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const imgFolderInfo = new FolderModel({ const imgFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_FOLDER.folder_location
}); });
const imgRenditionFolderInfo = new FolderModel({ const imgRenditionFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.IMG_RENDITION_FOLDER.folder_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts
+2 -3
View File
@@ -19,7 +19,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants'); import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel'; import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -40,8 +39,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const pptFolderInfo = new FolderModel({ const pptFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT_FOLDER.folder_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts
+2 -3
View File
@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants'); import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel'; import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -39,8 +38,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const textFolderInfo = new FolderModel({ const textFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts
+2 -3
View File
@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../../util/constants'); import CONSTANTS = require('../../../util/constants');
import resources = require('../../../util/resources');
import { FolderModel } from '../../../models/ACS/folderModel'; import { FolderModel } from '../../../models/ACS/folderModel';
import { AcsUserModel } from '../../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -42,8 +41,8 @@ describe('Viewer', () => {
const acsUser = new AcsUserModel(); const acsUser = new AcsUserModel();
const wordFolderInfo = new FolderModel({ const wordFolderInfo = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_name,
'location': resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.WORD_FOLDER.folder_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/info-drawer.component.e2e.ts
+2 -3
View File
@@ -21,7 +21,6 @@ import { ViewerPage } from '../../pages/adf/viewerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -42,8 +41,8 @@ describe('Info Drawer', () => {
let pngFileUploaded; let pngFileUploaded;
const pngFileInfo = new FileModel({ const pngFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/viewer-content-services-component.e2e.ts
+22 -24
View File
@@ -16,11 +16,9 @@
*/ */
import { browser } from 'protractor'; import { browser } from 'protractor';
import { LoginPage, UploadActions } from '@alfresco/adf-testing'; import { LoginPage, UploadActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage'; import { ViewerPage } from '../../pages/adf/viewerPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -36,40 +34,40 @@ describe('Content Services Viewer', () => {
let zoom; let zoom;
const pdfFile = new FileModel({ const pdfFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.PDF.first_page_text, 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF.first_page_text,
'secondPageText': resources.Files.ADF_DOCUMENTS.PDF.second_page_text, 'secondPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF.second_page_text,
'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF.last_page_number 'lastPageNumber': browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_number
}); });
const protectedFile = new FileModel({ const protectedFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.first_page_text, 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.first_page_text,
'secondPageText': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.second_page_text, 'secondPageText': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.second_page_text,
'lastPageNumber': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.last_page_number, 'lastPageNumber': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.last_page_number,
'password': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.password, 'password': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.password,
'location': resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_PROTECTED.file_location
}); });
const docxFile = new FileModel({ const docxFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location,
'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.first_page_text 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.first_page_text
}); });
const jpgFile = new FileModel({ const jpgFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': resources.Files.ADF_DOCUMENTS.JPG.file_name 'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name
}); });
const mp4File = new FileModel({ const mp4File = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.MP4.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_location,
'name': resources.Files.ADF_DOCUMENTS.MP4.file_name 'name': browser.params.resources.Files.ADF_DOCUMENTS.MP4.file_name
}); });
const unsupportedFile = new FileModel({ const unsupportedFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_location,
'name': resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name 'name': browser.params.resources.Files.ADF_DOCUMENTS.UNSUPPORTED.file_name
}); });
const pptFile = new FileModel({ const pptFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.PPT.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_location,
'name': resources.Files.ADF_DOCUMENTS.PPT.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PPT.file_name,
'firstPageText': resources.Files.ADF_DOCUMENTS.PPT.first_page_text 'firstPageText': browser.params.resources.Files.ADF_DOCUMENTS.PPT.first_page_text
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts
+2 -3
View File
@@ -19,7 +19,6 @@ import { browser } from 'protractor';
import { LoginPage, UploadActions } from '@alfresco/adf-testing'; import { LoginPage, UploadActions } from '@alfresco/adf-testing';
import { ViewerPage } from '../../pages/adf/viewerPage'; import { ViewerPage } from '../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -40,8 +39,8 @@ describe('Viewer', () => {
let txtFileUploaded; let txtFileUploaded;
const txtFileInfo = new FileModel({ const txtFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TXT.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
'location': resources.Files.ADF_DOCUMENTS.TXT.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/viewer-extension.e2e.ts
+2 -3
View File
@@ -22,7 +22,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monacoExtensionPage'; import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monacoExtensionPage';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -44,8 +43,8 @@ describe('Viewer', () => {
let jsFileUploaded; let jsFileUploaded;
const jsFileInfo = new FileModel({ const jsFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.JS.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_name,
'location': resources.Files.ADF_DOCUMENTS.JS.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.JS.file_location
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/core/viewer/viewer-properties.e2e.ts
+3 -4
View File
@@ -20,7 +20,6 @@ import { LoginPage, UploadActions, DataTableComponentPage } from '@alfresco/adf-
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage'; import { ViewerPage } from '../../pages/adf/viewerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -35,13 +34,13 @@ describe('Viewer - properties', () => {
const dataTable = new DataTableComponentPage(); const dataTable = new DataTableComponentPage();
const pngFile = new FileModel({ const pngFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const fileForOverlay = new FileModel({ const fileForOverlay = new FileModel({
'name': 'fileForOverlay.png', 'name': 'fileForOverlay.png',
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
this.alfrescoJsApi = new AlfrescoApi({ this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM', provider: 'ECM',
e2e/core/viewer/viewer-share-content.ts
+4 -5
View File
@@ -21,7 +21,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');
import resources = require('../../util/resources');
import { FileModel } from '../../models/ACS/fileModel'; import { FileModel } from '../../models/ACS/fileModel';
import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -45,13 +44,13 @@ describe('Viewer', () => {
const shareDialog = new ShareDialog(); const shareDialog = new ShareDialog();
const pngFileInfo = new FileModel({ const pngFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location
}); });
const wordFileInfo = new FileModel({ const wordFileInfo = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name,
'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location
}); });
let pngFileShared, wordFileUploaded; let pngFileShared, wordFileUploaded;
e2e/models/ACS/fileModel.ts
+6 -6
View File
@@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import resources = require('../../util/resources'); import { browser } from 'protractor';
import ContentModel = require('./contentModel'); import ContentModel = require('./contentModel');
import ContentPropertiesModel = require('./contentProperties'); import ContentPropertiesModel = require('./contentProperties');
import { CreatedByModel } from './createdByModel'; import { CreatedByModel } from './createdByModel';
@@ -26,13 +26,13 @@ export class FileModel {
id = StringUtil.generateRandomString(); id = StringUtil.generateRandomString();
name = StringUtil.generateRandomString(); name = StringUtil.generateRandomString();
shortName = this.name; shortName = this.name;
location = resources.Files.ADF_DOCUMENTS.PDF.file_location; location = browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location;
tooltip = this.name; tooltip = this.name;
version = ''; version = '';
firstPageText = resources.Files.ADF_DOCUMENTS.PDF.first_page_text; firstPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.first_page_text;
lastPageText = resources.Files.ADF_DOCUMENTS.PDF.last_page_text; lastPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_text;
secondPageText = resources.Files.ADF_DOCUMENTS.PDF.second_page_text; secondPageText = browser.params.resources.Files.ADF_DOCUMENTS.PDF.second_page_text;
lastPageNumber = resources.Files.ADF_DOCUMENTS.PDF.last_page_number; lastPageNumber = browser.params.resources.Files.ADF_DOCUMENTS.PDF.last_page_number;
createdAt = ''; createdAt = '';
password = ''; password = '';
createdByUser = new CreatedByModel(); createdByUser = new CreatedByModel();
e2e/process-services-cloud/apps-section-cloud.e2e.ts
+3 -4
View File
@@ -26,7 +26,6 @@ import {
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import resources = require('../util/resources');
describe('Applications list', () => { describe('Applications list', () => {
@@ -34,7 +33,7 @@ describe('Applications list', () => {
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const settingsPage = new SettingsPage(); const settingsPage = new SettingsPage();
const appListCloudPage = new AppListCloudPage(); const appListCloudPage = new AppListCloudPage();
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
let identityService: IdentityService; let identityService: IdentityService;
let applicationsService: ApplicationsService; let applicationsService: ApplicationsService;
let testUser; let testUser;
@@ -83,8 +82,8 @@ describe('Applications list', () => {
await appListCloudPage.checkApsContainer(); await appListCloudPage.checkApsContainer();
await appListCloudPage.checkAppIsDisplayed(simpleApp); await appListCloudPage.checkAppIsDisplayed(simpleApp);
await appListCloudPage.checkAppIsDisplayed(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name); await appListCloudPage.checkAppIsDisplayed(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name);
await appListCloudPage.checkAppIsDisplayed(resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name); await appListCloudPage.checkAppIsDisplayed(browser.params.resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name);
await expect(await appListCloudPage.countAllApps()).toEqual(3); await expect(await appListCloudPage.countAllApps()).toEqual(3);
}); });
e2e/process-services-cloud/edit-process-filters-component.e2e.ts
+1 -2
View File
@@ -21,7 +21,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Edit process filters cloud', () => { describe('Edit process filters cloud', () => {
@@ -33,7 +32,7 @@ describe('Edit process filters cloud', () => {
const processCloudDemoPage = new ProcessCloudDemoPage(); const processCloudDemoPage = new ProcessCloudDemoPage();
const settingsPage = new SettingsPage(); const settingsPage = new SettingsPage();
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
let identityService: IdentityService; let identityService: IdentityService;
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
let testUser, groupInfo; let testUser, groupInfo;
e2e/process-services-cloud/edit-task-filters-component.e2e.ts
+1 -3
View File
@@ -29,8 +29,6 @@ import {
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import resources = require('../util/resources');
describe('Edit task filters cloud', () => { describe('Edit task filters cloud', () => {
describe('Edit Task Filters', () => { describe('Edit Task Filters', () => {
@@ -45,7 +43,7 @@ describe('Edit task filters cloud', () => {
let testUser, groupInfo; let testUser, groupInfo;
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const completedTaskName = StringUtil.generateRandomString(), const completedTaskName = StringUtil.generateRandomString(),
assignedTaskName = StringUtil.generateRandomString(); assignedTaskName = StringUtil.generateRandomString();
e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts
+2 -3
View File
@@ -33,7 +33,6 @@ import {
import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import resources = require('../../util/resources');
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Form Field Component - Dropdown Widget', () => { describe('Form Field Component - Dropdown Widget', () => {
@@ -60,7 +59,7 @@ describe('Form Field Component - Dropdown Widget', () => {
let queryService: QueryService; let queryService: QueryService;
let runningProcessInstance, testUser, groupInfo, tasklist, task; let runningProcessInstance, testUser, groupInfo, tasklist, task;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
beforeAll(async () => { beforeAll(async () => {
@@ -75,7 +74,7 @@ describe('Form Field Component - Dropdown Widget', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts
+4 -5
View File
@@ -20,7 +20,6 @@ import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-s
import { GroupCloudComponentPage, PeopleCloudComponentPage, SettingsPage } from '@alfresco/adf-testing'; import { GroupCloudComponentPage, PeopleCloudComponentPage, SettingsPage } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { LoginSSOPage, IdentityService, GroupIdentityService, ApiService } from '@alfresco/adf-testing'; import { LoginSSOPage, IdentityService, GroupIdentityService, ApiService } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('People Groups Cloud Component', () => { describe('People Groups Cloud Component', () => {
@@ -93,7 +92,7 @@ describe('People Groups Cloud Component', () => {
it('[C305041] Should filter the People Single Selection with the Application name filter', async () => { it('[C305041] Should filter the People Single Selection with the Application name filter', async () => {
await peopleGroupCloudComponentPage.checkPeopleCloudSingleSelectionIsSelected(); await peopleGroupCloudComponentPage.checkPeopleCloudSingleSelectionIsSelected();
await peopleGroupCloudComponentPage.clickPeopleFilerByApp(); await peopleGroupCloudComponentPage.clickPeopleFilerByApp();
await peopleGroupCloudComponentPage.enterPeopleAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); await peopleGroupCloudComponentPage.enterPeopleAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name);
await peopleCloudComponent.searchAssignee(testUser.firstName); await peopleCloudComponent.searchAssignee(testUser.firstName);
await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`); await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`);
await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`); await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`);
@@ -104,7 +103,7 @@ describe('People Groups Cloud Component', () => {
it('[C305041] Should filter the People Multiple Selection with the Application name filter', async () => { it('[C305041] Should filter the People Multiple Selection with the Application name filter', async () => {
await peopleGroupCloudComponentPage.clickPeopleCloudMultipleSelection(); await peopleGroupCloudComponentPage.clickPeopleCloudMultipleSelection();
await peopleGroupCloudComponentPage.clickPeopleFilerByApp(); await peopleGroupCloudComponentPage.clickPeopleFilerByApp();
await peopleGroupCloudComponentPage.enterPeopleAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); await peopleGroupCloudComponentPage.enterPeopleAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name);
await peopleCloudComponent.searchAssignee(testUser.firstName); await peopleCloudComponent.searchAssignee(testUser.firstName);
await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`); await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`);
await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`); await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`);
@@ -122,7 +121,7 @@ describe('People Groups Cloud Component', () => {
it('[C305041] Should filter the Groups Single Selection with the Application name filter', async () => { it('[C305041] Should filter the Groups Single Selection with the Application name filter', async () => {
await peopleGroupCloudComponentPage.clickGroupCloudSingleSelection(); await peopleGroupCloudComponentPage.clickGroupCloudSingleSelection();
await peopleGroupCloudComponentPage.clickGroupFilerByApp(); await peopleGroupCloudComponentPage.clickGroupFilerByApp();
await peopleGroupCloudComponentPage.enterGroupAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); await peopleGroupCloudComponentPage.enterGroupAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name);
await groupCloudComponentPage.searchGroups(hrGroup.name); await groupCloudComponentPage.searchGroups(hrGroup.name);
await groupCloudComponentPage.checkGroupIsDisplayed(hrGroup.name); await groupCloudComponentPage.checkGroupIsDisplayed(hrGroup.name);
await groupCloudComponentPage.selectGroupFromList(hrGroup.name); await groupCloudComponentPage.selectGroupFromList(hrGroup.name);
@@ -132,7 +131,7 @@ describe('People Groups Cloud Component', () => {
it('[C305041] Should filter the Groups Multiple Selection with the Application name filter', async () => { it('[C305041] Should filter the Groups Multiple Selection with the Application name filter', async () => {
await peopleGroupCloudComponentPage.clickGroupCloudMultipleSelection(); await peopleGroupCloudComponentPage.clickGroupCloudMultipleSelection();
await peopleGroupCloudComponentPage.clickGroupFilerByApp(); await peopleGroupCloudComponentPage.clickGroupFilerByApp();
await peopleGroupCloudComponentPage.enterGroupAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); await peopleGroupCloudComponentPage.enterGroupAppName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name);
await groupCloudComponentPage.searchGroups(testGroup.name); await groupCloudComponentPage.searchGroups(testGroup.name);
await groupCloudComponentPage.checkGroupIsDisplayed(testGroup.name); await groupCloudComponentPage.checkGroupIsDisplayed(testGroup.name);
await groupCloudComponentPage.selectGroupFromList(testGroup.name); await groupCloudComponentPage.selectGroupFromList(testGroup.name);
e2e/process-services-cloud/process-custom-filters.e2e.ts
+3 -4
View File
@@ -23,7 +23,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { AppListCloudPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; import { AppListCloudPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing';
import resources = require('../util/resources');
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config';
@@ -55,7 +54,7 @@ describe('Process list cloud', () => {
let completedProcess, runningProcessInstance, switchProcessInstance, noOfApps, testUser, groupInfo, let completedProcess, runningProcessInstance, switchProcessInstance, noOfApps, testUser, groupInfo,
anotherProcessInstance; anotherProcessInstance;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
beforeAll(async () => { beforeAll(async () => {
@@ -70,10 +69,10 @@ describe('Process list cloud', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
const anotherProcessDefinition = await processDefinitionService const anotherProcessDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
e2e/process-services-cloud/process-filter-results.e2e.ts
+5 -6
View File
@@ -23,7 +23,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { AppListCloudPage, LocalStorageUtil } from '@alfresco/adf-testing'; import { AppListCloudPage, LocalStorageUtil } from '@alfresco/adf-testing';
import resources = require('../util/resources');
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config';
@@ -60,8 +59,8 @@ describe('Process filters cloud', () => {
let completedProcess, runningProcessInstance, suspendProcessInstance, testUser, anotherUser, groupInfo, let completedProcess, runningProcessInstance, suspendProcessInstance, testUser, anotherUser, groupInfo,
anotherProcessInstance, processDefinition, anotherProcessDefinition, anotherProcessInstance, processDefinition, anotherProcessDefinition,
differentAppUserProcessInstance, simpleAppProcessDefinition; differentAppUserProcessInstance, simpleAppProcessDefinition;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
beforeAll(async () => { beforeAll(async () => {
@@ -79,7 +78,7 @@ describe('Process filters cloud', () => {
await apiService.login(anotherUser.email, anotherUser.password); await apiService.login(anotherUser.email, anotherUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
simpleAppProcessDefinition = await processDefinitionService simpleAppProcessDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
differentAppUserProcessInstance = await processInstancesService.createProcessInstance(simpleAppProcessDefinition.entry.key, simpleApp, { differentAppUserProcessInstance = await processInstancesService.createProcessInstance(simpleAppProcessDefinition.entry.key, simpleApp, {
@@ -89,10 +88,10 @@ describe('Process filters cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinition = await processDefinitionService processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
anotherProcessDefinition = await processDefinitionService anotherProcessDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.anotherCandidateGroupProcess, candidateBaseApp);
runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, { runningProcessInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp, {
'name': StringUtil.generateRandomString(), 'name': StringUtil.generateRandomString(),
e2e/process-services-cloud/process-filters-cloud.e2e.ts
+2 -3
View File
@@ -31,7 +31,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Process filters cloud', () => { describe('Process filters cloud', () => {
@@ -55,7 +54,7 @@ describe('Process filters cloud', () => {
let queryService: QueryService; let queryService: QueryService;
let runningProcess, completedProcess, testUser, groupInfo; let runningProcess, completedProcess, testUser, groupInfo;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
beforeAll(async () => { beforeAll(async () => {
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
@@ -69,7 +68,7 @@ describe('Process filters cloud', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
e2e/process-services-cloud/process-header-cloud.e2e.ts
+2 -4
View File
@@ -36,14 +36,12 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas
import { ProcessHeaderCloudPage } from '@alfresco/adf-testing'; import { ProcessHeaderCloudPage } from '@alfresco/adf-testing';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import resources = require('../util/resources');
describe('Process Header cloud component', () => { describe('Process Header cloud component', () => {
describe('Process Header cloud component', () => { describe('Process Header cloud component', () => {
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const subProcessApp = resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name; const subProcessApp = browser.params.resources.ACTIVITI7_APPS.SUB_PROCESS_APP.name;
const formatDate = 'MMM D, YYYY'; const formatDate = 'MMM D, YYYY';
const processHeaderCloudPage = new ProcessHeaderCloudPage(); const processHeaderCloudPage = new ProcessHeaderCloudPage();
e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts
+2 -4
View File
@@ -21,10 +21,8 @@ import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/p
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing'; import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing';
import { ProcessInstancesService } from '@alfresco/adf-testing'; import { ProcessInstancesService } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Process list cloud', () => { describe('Process list cloud', () => {
@@ -42,7 +40,7 @@ describe('Process list cloud', () => {
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
let testUser, groupInfo, editProcess, deleteProcess; let testUser, groupInfo, editProcess, deleteProcess;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
beforeAll(async () => { beforeAll(async () => {
@@ -57,7 +55,7 @@ describe('Process list cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
editProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); editProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
e2e/process-services-cloud/process-list-cloud-component.e2e.ts
+2 -4
View File
@@ -26,10 +26,8 @@ import {
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
import resources = require('../util/resources');
describe('Process list cloud', () => { describe('Process list cloud', () => {
@@ -47,7 +45,7 @@ describe('Process list cloud', () => {
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
let testUser, groupInfo; let testUser, groupInfo;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
let jsonFile; let jsonFile;
let runningProcess; let runningProcess;
@@ -63,7 +61,7 @@ describe('Process list cloud', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateGroupProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
+2 -4
View File
@@ -21,10 +21,8 @@ import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/p
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing'; import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing';
import { ProcessInstancesService } from '@alfresco/adf-testing'; import { ProcessInstancesService } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Process list cloud', () => { describe('Process list cloud', () => {
@@ -42,7 +40,7 @@ describe('Process list cloud', () => {
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
let testUser, groupInfo; let testUser, groupInfo;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
const noOfProcesses = 3; const noOfProcesses = 3;
const processInstances = []; const processInstances = [];
@@ -59,7 +57,7 @@ describe('Process list cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
for (let i = 0; i < noOfProcesses; i++) { for (let i = 0; i < noOfProcesses; i++) {
e2e/process-services-cloud/start-process-cloud.e2e.ts
+1 -2
View File
@@ -21,7 +21,6 @@ import { browser, protractor } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { StringUtil, BrowserActions } from '@alfresco/adf-testing'; import { StringUtil, BrowserActions } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Start Process', () => { describe('Start Process', () => {
@@ -41,7 +40,7 @@ describe('Start Process', () => {
const processNameBiggerThen255Characters = StringUtil.generateRandomString(256); const processNameBiggerThen255Characters = StringUtil.generateRandomString(256);
const lengthValidationError = 'Length exceeded, 255 characters max.'; const lengthValidationError = 'Length exceeded, 255 characters max.';
const requiredError = 'Process Name is required'; const requiredError = 'Process Name is required';
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
let identityService: IdentityService; let identityService: IdentityService;
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
let testUser, groupInfo; let testUser, groupInfo;
e2e/process-services-cloud/start-task-form-cloud.e2e.ts
+10 -11
View File
@@ -39,7 +39,6 @@ import {
ProcessInstancesService, ProcessInstancesService,
ProcessDefinitionsService ProcessDefinitionsService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import resources = require('../util/resources');
import { StartProcessCloudConfiguration } from './config/start-process-cloud.config'; import { StartProcessCloudConfiguration } from './config/start-process-cloud.config';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage'; import { ProcessDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services-cloud/processDetailsCloudDemoPage';
@@ -85,15 +84,15 @@ describe('Start Task Form', () => {
let processInstancesService: ProcessInstancesService; let processInstancesService: ProcessInstancesService;
let processDefinition, uploadLocalFileProcess, uploadContentFileProcess, uploadDefaultFileProcess, let processDefinition, uploadLocalFileProcess, uploadContentFileProcess, uploadDefaultFileProcess,
cancelUploadFileProcess, completeUploadFileProcess; cancelUploadFileProcess, completeUploadFileProcess;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
const pdfFile = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name }); const pdfFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name });
const pdfFileModel = new FileModel({ const pdfFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PDF.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name,
'location': resources.Files.ADF_DOCUMENTS.PDF.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_location
}); });
const testFileModel = new FileModel({ const testFileModel = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.TEST.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_name,
'location': resources.Files.ADF_DOCUMENTS.TEST.file_location 'location': browser.params.resources.Files.ADF_DOCUMENTS.TEST.file_location
}); });
let identityService: IdentityService; let identityService: IdentityService;
@@ -114,7 +113,7 @@ describe('Start Task Form', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
processDefinition = await processDefinitionService processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.uploadFileProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.uploadFileProcess, candidateBaseApp);
await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
@@ -192,7 +191,7 @@ describe('Start Task Form', () => {
await tasksCloudDemoPage.openNewTaskForm(); await tasksCloudDemoPage.openNewTaskForm();
await startTask.checkFormIsDisplayed(); await startTask.checkFormIsDisplayed();
await startTask.addName(standaloneTaskName); await startTask.addName(standaloneTaskName);
await startTask.selectFormDefinition(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform); await startTask.selectFormDefinition(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform);
await startTask.clickStartButton(); await startTask.clickStartButton();
await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(standaloneTaskName); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(standaloneTaskName);
await tasksCloudDemoPage.taskListCloudComponent().selectRow(standaloneTaskName); await tasksCloudDemoPage.taskListCloudComponent().selectRow(standaloneTaskName);
@@ -225,8 +224,8 @@ describe('Start Task Form', () => {
await tasksCloudDemoPage.openNewTaskForm(); await tasksCloudDemoPage.openNewTaskForm();
await startTask.checkFormIsDisplayed(); await startTask.checkFormIsDisplayed();
await startTask.checkFormDefinitionIsNotDisplayed('uploadfileform'); await startTask.checkFormDefinitionIsNotDisplayed('uploadfileform');
await startTask.checkFormDefinitionIsDisplayed(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform); await startTask.checkFormDefinitionIsDisplayed(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.starteventform);
await startTask.checkFormDefinitionIsDisplayed(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.formtotestvalidations); await startTask.checkFormDefinitionIsDisplayed(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.forms.formtotestvalidations);
}); });
}); });
e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts
+1 -2
View File
@@ -31,7 +31,6 @@ import {
SettingsPage, SettingsPage,
GroupIdentityService GroupIdentityService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import resources = require('../../util/resources');
describe('Start Task', () => { describe('Start Task', () => {
@@ -57,7 +56,7 @@ describe('Start Task', () => {
const requiredError = 'Field required'; const requiredError = 'Field required';
const dateValidationError = 'Date format DD/MM/YYYY'; const dateValidationError = 'Date format DD/MM/YYYY';
let apsUser, testUser, activitiUser, groupInfo; let apsUser, testUser, activitiUser, groupInfo;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
let identityService: IdentityService; let identityService: IdentityService;
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts
+1 -2
View File
@@ -31,7 +31,6 @@ import {
SettingsPage, SettingsPage,
GroupIdentityService, RolesService GroupIdentityService, RolesService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import resources = require('../../util/resources');
describe('Start Task - Group Cloud Component', () => { describe('Start Task - Group Cloud Component', () => {
@@ -51,7 +50,7 @@ describe('Start Task - Group Cloud Component', () => {
const bothGroupsTaskName = StringUtil.generateRandomString(5); const bothGroupsTaskName = StringUtil.generateRandomString(5);
const oneGroupTaskName = StringUtil.generateRandomString(5); const oneGroupTaskName = StringUtil.generateRandomString(5);
let apsUser, testUser, hrGroup, testGroup; let apsUser, testUser, hrGroup, testGroup;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
let identityService: IdentityService; let identityService: IdentityService;
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
e2e/process-services-cloud/task-filters-cloud.e2e.ts
+1 -2
View File
@@ -19,7 +19,6 @@ import { browser } from 'protractor';
import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil, SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil, SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import resources = require('../util/resources');
describe('Task filters cloud', () => { describe('Task filters cloud', () => {
@@ -36,7 +35,7 @@ describe('Task filters cloud', () => {
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
const newTask = StringUtil.generateRandomString(5), completedTask = StringUtil.generateRandomString(5); const newTask = StringUtil.generateRandomString(5), completedTask = StringUtil.generateRandomString(5);
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
beforeAll(async() => { beforeAll(async() => {
e2e/process-services-cloud/task-form-cloud-component.e2e.ts
+5 -7
View File
@@ -32,8 +32,6 @@ import {
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import resources = require('../util/resources');
describe('Task form cloud component', () => { describe('Task form cloud component', () => {
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
@@ -53,8 +51,8 @@ describe('Task form cloud component', () => {
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
let completedTask, createdTask, assigneeTask, toBeCompletedTask, formValidationsTask, testUser, formTaskId; let completedTask, createdTask, assigneeTask, toBeCompletedTask, formValidationsTask, testUser, formTaskId;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString(); const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString();
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers);
@@ -105,13 +103,13 @@ describe('Task form cloud component', () => {
for (let i = 0; i < 3; i++) { for (let i = 0; i < 3; i++) {
visibilityConditionTasks[i] = await tasksService.createStandaloneTaskWithForm(StringUtil.generateRandomString(), visibilityConditionTasks[i] = await tasksService.createStandaloneTaskWithForm(StringUtil.generateRandomString(),
simpleApp, resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityFields.id); simpleApp, browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityFields.id);
await tasksService.claimTask(visibilityConditionTasks[i].entry.id, simpleApp); await tasksService.claimTask(visibilityConditionTasks[i].entry.id, simpleApp);
} }
for (let i = 3; i < 6; i++) { for (let i = 3; i < 6; i++) {
visibilityConditionTasks[i] = await tasksService.createStandaloneTaskWithForm(StringUtil.generateRandomString(), visibilityConditionTasks[i] = await tasksService.createStandaloneTaskWithForm(StringUtil.generateRandomString(),
simpleApp, resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityVars.id); simpleApp, browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.forms.tabVisibilityVars.id);
await tasksService.claimTask(visibilityConditionTasks[i].entry.id, simpleApp); await tasksService.claimTask(visibilityConditionTasks[i].entry.id, simpleApp);
} }
@@ -128,7 +126,7 @@ describe('Task form cloud component', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
let processDefinition = await processDefinitionService let processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateUserProcess, candidateBaseApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.processes.candidateUserProcess, candidateBaseApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp);
e2e/process-services-cloud/task-header-cloud.e2e.ts
+1 -3
View File
@@ -19,11 +19,9 @@ import CONSTANTS = require('../util/constants');
import { ApiService, StringUtil, SettingsPage, IdentityService, GroupIdentityService, LocalStorageUtil } from '@alfresco/adf-testing'; import { ApiService, StringUtil, SettingsPage, IdentityService, GroupIdentityService, LocalStorageUtil } from '@alfresco/adf-testing';
import moment = require('moment'); import moment = require('moment');
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { LoginSSOPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing'; import { LoginSSOPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import resources = require('../util/resources');
describe('Task Header cloud component', () => { describe('Task Header cloud component', () => {
const basicCreatedTaskName = StringUtil.generateRandomString(); const basicCreatedTaskName = StringUtil.generateRandomString();
@@ -37,7 +35,7 @@ describe('Task Header cloud component', () => {
let completedEndDate; let completedEndDate;
let defaultDate; let defaultDate;
let groupInfo, testUser; let groupInfo, testUser;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const priority = 30; const priority = 30;
const description = 'descriptionTask'; const description = 'descriptionTask';
const formatDate = 'MMM D, YYYY'; const formatDate = 'MMM D, YYYY';
e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts
+2 -3
View File
@@ -23,7 +23,6 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas
import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing'; import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing';
import { ProcessInstancesService } from '@alfresco/adf-testing'; import { ProcessInstancesService } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Process list cloud', () => { describe('Process list cloud', () => {
@@ -42,7 +41,7 @@ describe('Process list cloud', () => {
let tasksService: TasksService; let tasksService: TasksService;
let testUser, groupInfo, editProcess, deleteProcess, editTask, deleteTask; let testUser, groupInfo, editProcess, deleteProcess, editTask, deleteTask;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
beforeAll(async () => { beforeAll(async () => {
@@ -57,7 +56,7 @@ describe('Process list cloud', () => {
await apiService.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
editProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); editProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
e2e/process-services-cloud/task-list-properties.e2e.ts
+3 -6
View File
@@ -25,11 +25,8 @@ import {
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; import { TaskListCloudConfiguration } from './config/task-list-cloud.config';
import moment = require('moment'); import moment = require('moment');
import resources = require('../util/resources');
describe('Edit task filters and task list properties', () => { describe('Edit task filters and task list properties', () => {
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
@@ -45,8 +42,8 @@ describe('Edit task filters and task list properties', () => {
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers);
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const candidateBaseApp = resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name; const candidateBaseApp = browser.params.resources.ACTIVITI7_APPS.CANDIDATE_BASE_APP.name;
const noTasksFoundMessage = 'No Tasks Found'; const noTasksFoundMessage = 'No Tasks Found';
let createdTask, notAssigned, notDisplayedTask, processDefinition, processInstance, priorityTask, subTask, let createdTask, notAssigned, notDisplayedTask, processDefinition, processInstance, priorityTask, subTask,
otherOwnerTask, testUser, groupInfo; otherOwnerTask, testUser, groupInfo;
@@ -86,7 +83,7 @@ describe('Edit task filters and task list properties', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
processDefinition = await processDefinitionService processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.dropdownrestprocess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
e2e/process-services-cloud/task-list-selection.e2e.ts
+1 -2
View File
@@ -22,7 +22,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import { StringUtil } from '@alfresco/adf-testing'; import { StringUtil } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Task list cloud - selection', () => { describe('Task list cloud - selection', () => {
@@ -41,7 +40,7 @@ describe('Task list cloud - selection', () => {
let identityService: IdentityService; let identityService: IdentityService;
let groupIdentityService: GroupIdentityService; let groupIdentityService: GroupIdentityService;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const noOfTasks = 3; const noOfTasks = 3;
let response, testUser, groupInfo; let response, testUser, groupInfo;
const tasks = []; const tasks = [];
e2e/process-services-cloud/tasks-custom-filters.e2e.ts
+2 -3
View File
@@ -30,7 +30,6 @@ import {
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import resources = require('../util/resources');
describe('Task filters cloud', () => { describe('Task filters cloud', () => {
@@ -54,7 +53,7 @@ describe('Task filters cloud', () => {
const createdTaskName = StringUtil.generateRandomString(), const createdTaskName = StringUtil.generateRandomString(),
completedTaskName = StringUtil.generateRandomString(), completedTaskName = StringUtil.generateRandomString(),
assignedTaskName = StringUtil.generateRandomString(), deletedTaskName = StringUtil.generateRandomString(); assignedTaskName = StringUtil.generateRandomString(), deletedTaskName = StringUtil.generateRandomString();
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.name;
let assignedTask, deletedTask, testUser, groupInfo; let assignedTask, deletedTask, testUser, groupInfo;
const orderByNameAndPriority = ['cCreatedTask', 'dCreatedTask', 'eCreatedTask']; const orderByNameAndPriority = ['cCreatedTask', 'dCreatedTask', 'eCreatedTask'];
let priority = 30; let priority = 30;
@@ -85,7 +84,7 @@ describe('Task filters cloud', () => {
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService const processDefinition = await processDefinitionService
.getProcessDefinitionByName(resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp); .getProcessDefinitionByName(browser.params.resources.ACTIVITI7_APPS.SIMPLE_APP.processes.simpleProcess, simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
const processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); const processInstance = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
e2e/process-services/apps-section.e2e.ts
+3 -7
View File
@@ -19,11 +19,7 @@ import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing'; import { LoginPage } from '@alfresco/adf-testing';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
@@ -34,9 +30,9 @@ describe('Modify applications', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const processServicesPage = new ProcessServicesPage(); const processServicesPage = new ProcessServicesPage();
const app = resources.Files.APP_WITH_PROCESSES; const app = browser.params.resources.Files.APP_WITH_PROCESSES;
const appToBeDeleted = resources.Files.SIMPLE_APP_WITH_USER_FORM; const appToBeDeleted = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const replacingApp = resources.Files.WIDGETS_SMOKE_TEST; const replacingApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST;
const apps = new AppsActions(); const apps = new AppsActions();
const modelActions = new ModelsActions(); const modelActions = new ModelsActions();
let firstApp, appVersionToBeDeleted; let firstApp, appVersionToBeDeleted;
e2e/process-services/attach-file-widget.e2e.ts
+2 -8
View File
@@ -16,16 +16,10 @@
*/ */
import { LoginPage, Widget } from '@alfresco/adf-testing'; import { LoginPage, Widget } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { FileModel } from '../models/ACS/fileModel'; import { FileModel } from '../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { ViewerPage } from '../pages/adf/viewerPage'; import { ViewerPage } from '../pages/adf/viewerPage';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -41,8 +35,8 @@ describe('Start Task - Task App', () => {
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
let processUserModel; let processUserModel;
const app = resources.Files.WIDGETS_SMOKE_TEST; const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST;
const pdfFile = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name }); const pdfFile = new FileModel({ 'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name });
const appFields = app.form_fields; const appFields = app.form_fields;
beforeAll(async () => { beforeAll(async () => {
e2e/process-services/attach-form-component.e2e.ts
+1 -2
View File
@@ -23,7 +23,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -38,7 +37,7 @@ describe('Attach Form Component', () => {
const formFields = new FormFields(); const formFields = new FormFields();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const formTextField = app.form_fields.form_fieldId; const formTextField = app.form_fields.form_fieldId;
let user, tenantId, appId; let user, tenantId, appId;
e2e/process-services/checklist-component.e2e.ts
+1 -6
View File
@@ -20,14 +20,9 @@ import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import { ChecklistDialog } from '../pages/adf/process-services/dialog/createChecklistDialog'; import { ChecklistDialog } from '../pages/adf/process-services/dialog/createChecklistDialog';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import fs = require('fs'); import fs = require('fs');
@@ -37,7 +32,7 @@ describe('Checklist component', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();
let processUserModel; let processUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const taskPage = new TasksPage(); const taskPage = new TasksPage();
const processServices = new ProcessServicesPage(); const processServices = new ProcessServicesPage();
const checklistDialog = new ChecklistDialog(); const checklistDialog = new ChecklistDialog();
e2e/process-services/comment-component-processes.e2e.ts
+1 -4
View File
@@ -20,9 +20,6 @@ import { LoginPage } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
import { CommentsPage } from '../pages/adf/commentsPage'; import { CommentsPage } from '../pages/adf/commentsPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
@@ -34,7 +31,7 @@ describe('Comment component for Processes', () => {
const commentsPage = new CommentsPage(); const commentsPage = new CommentsPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
let user, tenantId, appId, processInstanceId, addedComment; let user, tenantId, appId, processInstanceId, addedComment;
beforeAll(async () => { beforeAll(async () => {
e2e/process-services/comment-component-tasks.e2e.ts
+1 -5
View File
@@ -21,11 +21,7 @@ import { LoginPage } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { CommentsPage } from '../pages/adf/commentsPage'; import { CommentsPage } from '../pages/adf/commentsPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
@@ -37,7 +33,7 @@ describe('Comment component for Processes', () => {
const taskPage = new TasksPage(); const taskPage = new TasksPage();
const commentsPage = new CommentsPage(); const commentsPage = new CommentsPage();
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
let user, tenantId, appId, secondUser, newTaskId; let user, tenantId, appId, secondUser, newTaskId;
const taskName = { const taskName = {
e2e/process-services/custom-process-filters-sorting.e2e.ts
+1 -4
View File
@@ -21,9 +21,6 @@ import { LoginPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
import { FiltersPage } from '../pages/adf/process-services/filtersPage'; import { FiltersPage } from '../pages/adf/process-services/filtersPage';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
@@ -37,7 +34,7 @@ describe('Sorting for process filters', () => {
const apps = new AppsActions(); const apps = new AppsActions();
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
let tenantId, appId, user, processesQuery; let tenantId, appId, user, processesQuery;
const processFilter = { const processFilter = {
e2e/process-services/custom-tasks-filters.e2e.ts
+2 -6
View File
@@ -20,13 +20,9 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/taskListDemoPage'; import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/taskListDemoPage';
import { PaginationPage, DateUtil } from '@alfresco/adf-testing'; import { PaginationPage, DateUtil } from '@alfresco/adf-testing';
import moment = require('moment'); import moment = require('moment');
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { Util } from '../util/util'; import { Util } from '../util/util';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { AppsRuntimeActions } from '../actions/APS/appsRuntime.actions'; import { AppsRuntimeActions } from '../actions/APS/appsRuntime.actions';
@@ -39,9 +35,9 @@ describe('Start Task - Custom App', () => {
const taskListSinglePage = new TaskListDemoPage(); const taskListSinglePage = new TaskListDemoPage();
const paginationPage = new PaginationPage(); const paginationPage = new PaginationPage();
let processUserModel; let processUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
let appRuntime, secondAppRuntime; let appRuntime, secondAppRuntime;
const secondApp = resources.Files.WIDGETS_SMOKE_TEST; const secondApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST;
let appModel, secondAppModel; let appModel, secondAppModel;
const completedTasks = []; const completedTasks = [];
const paginationTasksName = ['t01', 't02', 't03', 't04', 't05', 't06', 't07', 't08', 't09', 't10', 't11', 't12', 't13', 'taskOne', 'taskTwo', 'taskOne']; const paginationTasksName = ['t01', 't02', 't03', 't04', 't05', 't06', 't07', 't08', 't09', 't10', 't11', 't12', 't13', 'taskOne', 'taskTwo', 'taskOne'];
e2e/process-services/dynamic-table-date-picker.e2e.ts
+2 -5
View File
@@ -19,10 +19,7 @@ import { LoginPage, Widget, DatePickerPage, DateUtil } from '@alfresco/adf-testi
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -62,7 +59,7 @@ describe('Dynamic Table', () => {
}); });
describe('Date Picker', () => { describe('Date Picker', () => {
const app = resources.Files.DYNAMIC_TABLE_APP; const app = browser.params.resources.Files.DYNAMIC_TABLE_APP;
const randomText = { const randomText = {
date: '12/12/2012', date: '12/12/2012',
@@ -136,7 +133,7 @@ describe('Dynamic Table', () => {
}); });
describe('Required Dropdown', () => { describe('Required Dropdown', () => {
const app = resources.Files.APP_DYNAMIC_TABLE_DROPDOWN; const app = browser.params.resources.Files.APP_DYNAMIC_TABLE_DROPDOWN;
const dropdown = widget.dropdown(); const dropdown = widget.dropdown();
beforeAll(async () => { beforeAll(async () => {
e2e/process-services/empty-process-list-component.e2e.ts
+2 -4
View File
@@ -16,7 +16,6 @@
*/ */
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { LoginPage } from '@alfresco/adf-testing'; import { LoginPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
@@ -24,7 +23,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/processFilters
import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
import { ProcessListPage } from '../pages/adf/process-services/processListPage'; import { ProcessListPage } from '../pages/adf/process-services/processListPage';
import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; import { StartProcessPage } from '../pages/adf/process-services/startProcessPage';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -39,8 +37,8 @@ describe('Empty Process List Test', () => {
const processListPage = new ProcessListPage(); const processListPage = new ProcessListPage();
const startProcessPage = new StartProcessPage(); const startProcessPage = new StartProcessPage();
const appA = resources.Files.APP_WITH_PROCESSES; const appA = browser.params.resources.Files.APP_WITH_PROCESSES;
const appB = resources.Files.SIMPLE_APP_WITH_USER_FORM; const appB = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
let user; let user;
e2e/process-services/form-people-widget.e2e.ts
+1 -4
View File
@@ -21,9 +21,6 @@ import { StartProcessPage } from '../pages/adf/process-services/startProcessPage
import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -34,7 +31,7 @@ describe('Form widgets - People', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();
let processUserModel; let processUserModel;
const app = resources.Files.APP_WITH_USER_WIDGET; const app = browser.params.resources.Files.APP_WITH_USER_WIDGET;
const processFiltersPage = new ProcessFiltersPage(); const processFiltersPage = new ProcessFiltersPage();
let appModel; let appModel;
let alfrescoJsApi; let alfrescoJsApi;
e2e/process-services/form-widgets-component.e2e.ts
+2 -7
View File
@@ -17,15 +17,10 @@
import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); import FormDefinitionModel = require('../models/APS/FormDefinitionModel');
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -42,7 +37,7 @@ describe('Form widgets', () => {
const widget = new Widget(); const widget = new Widget();
describe('Form widgets', () => { describe('Form widgets', () => {
const app = resources.Files.WIDGETS_SMOKE_TEST; const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST;
const appFields = app.form_fields; const appFields = app.form_fields;
beforeAll(async () => { beforeAll(async () => {
@@ -201,7 +196,7 @@ describe('Form widgets', () => {
describe('with fields involving other people', () => { describe('with fields involving other people', () => {
const appsActions = new AppsActions(); const appsActions = new AppsActions();
const app = resources.Files.FORM_ADF; const app = browser.params.resources.Files.FORM_ADF;
let deployedApp, process; let deployedApp, process;
const appFields = app.form_fields; const appFields = app.form_fields;
e2e/process-services/pagination-processlist-addingProcesses.e2e.ts
+1 -4
View File
@@ -20,9 +20,6 @@ import { PaginationPage } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -41,7 +38,7 @@ describe('Process List - Pagination when adding processes', () => {
const processDetailsPage = new ProcessDetailsPage(); const processDetailsPage = new ProcessDetailsPage();
let processUserModel; let processUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const nrOfProcesses = 25; const nrOfProcesses = 25;
let page, totalPages; let page, totalPages;
let i; let i;
e2e/process-services/pagination-tasklist-addingTasks.e2e.ts
+1 -5
View File
@@ -19,14 +19,10 @@ import { LoginPage } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { PaginationPage } from '@alfresco/adf-testing'; import { PaginationPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import resources = require('../util/resources');
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Items per page set to 15 and adding of tasks', () => { describe('Items per page set to 15 and adding of tasks', () => {
@@ -36,7 +32,7 @@ describe('Items per page set to 15 and adding of tasks', () => {
const paginationPage = new PaginationPage(); const paginationPage = new PaginationPage();
let processUserModel; let processUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
let currentPage = 1; let currentPage = 1;
const nrOfTasks = 25; const nrOfTasks = 25;
const totalPages = 2; const totalPages = 2;
e2e/process-services/people-component.e2e.ts
+1 -6
View File
@@ -19,14 +19,9 @@ import { LoginPage } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import fs = require('fs'); import fs = require('fs');
@@ -37,7 +32,7 @@ describe('People component', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
let processUserModel, assigneeUserModel, secondAssigneeUserModel; let processUserModel, assigneeUserModel, secondAssigneeUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const taskPage = new TasksPage(); const taskPage = new TasksPage();
const peopleTitle = 'People this task is shared with '; const peopleTitle = 'People this task is shared with ';
const processServices = new ProcessServicesPage(); const processServices = new ProcessServicesPage();
e2e/process-services/process-attachmentList-actionMenu.e2e.ts
+3 -6
View File
@@ -21,9 +21,6 @@ import { ProcessDetailsPage } from '../pages/adf/process-services/processDetails
import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
import { ViewerPage } from '../pages/adf/viewerPage'; import { ViewerPage } from '../pages/adf/viewerPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
@@ -38,10 +35,10 @@ describe('Attachment list action menu for processes', () => {
const attachmentListPage = new AttachmentListPage(); const attachmentListPage = new AttachmentListPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const viewerPage = new ViewerPage(); const viewerPage = new ViewerPage();
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const pngFile = new FileModel({ const pngFile = new FileModel({
location: resources.Files.ADF_DOCUMENTS.PNG.file_location, location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location,
name: resources.Files.ADF_DOCUMENTS.PNG.file_name name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name
}); });
const downloadedPngFile = pngFile.name; const downloadedPngFile = pngFile.name;
e2e/process-services/process-filters-component.e2e.ts
+1 -3
View File
@@ -15,10 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
import resources = require('../util/resources');
import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; import { LoginPage, BrowserActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import { StartProcessPage } from '../pages/adf/process-services/startProcessPage'; import { StartProcessPage } from '../pages/adf/process-services/startProcessPage';
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
@@ -44,7 +42,7 @@ describe('Process Filters Test', () => {
const processDetailsPage = new ProcessDetailsPage(); const processDetailsPage = new ProcessDetailsPage();
let appModel; let appModel;
const app = resources.Files.APP_WITH_DATE_FIELD_FORM; const app = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM;
const processTitle = { const processTitle = {
running: 'Test_running', running: 'Test_running',
e2e/process-services/process-instance-details.e2e.ts
+1 -3
View File
@@ -16,11 +16,9 @@
*/ */
import { browser } from 'protractor'; import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import resources = require('../util/resources');
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { LoginPage } from '@alfresco/adf-testing'; import { LoginPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -39,7 +37,7 @@ describe('Process Instance Details', () => {
const processDetailsPage = new ProcessDetailsPage(); const processDetailsPage = new ProcessDetailsPage();
let appModel, process, user; let appModel, process, user;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const PROCESS_DATE_FORMAT = 'mmm d, yyyy'; const PROCESS_DATE_FORMAT = 'mmm d, yyyy';
beforeAll(async () => { beforeAll(async () => {
e2e/process-services/processList-component.e2e.ts
+2 -5
View File
@@ -17,10 +17,7 @@
import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; import { LoginPage, BrowserActions } from '@alfresco/adf-testing';
import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/processListDemoPage'; import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/processListDemoPage';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -30,8 +27,8 @@ describe('Process List Test', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();
const processListDemoPage = new ProcessListDemoPage(); const processListDemoPage = new ProcessListDemoPage();
const appWithDateField = resources.Files.APP_WITH_DATE_FIELD_FORM; const appWithDateField = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM;
const appWithUserWidget = resources.Files.APP_WITH_USER_WIDGET; const appWithUserWidget = browser.params.resources.Files.APP_WITH_USER_WIDGET;
let appDateModel, appUserWidgetModel, user; let appDateModel, appUserWidgetModel, user;
const processList = ['Process With Date', 'Process With Date 2', 'Process With User Widget', 'Process With User Widget 2']; const processList = ['Process With Date', 'Process With Date 2', 'Process With User Widget', 'Process With User Widget 2'];
e2e/process-services/processlist-pagination.e2e.ts
+1 -4
View File
@@ -20,10 +20,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { PaginationPage } from '@alfresco/adf-testing'; import { PaginationPage } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -51,7 +48,7 @@ describe('Process List - Pagination', () => {
const processDetailsPage = new ProcessDetailsPage(); const processDetailsPage = new ProcessDetailsPage();
let deployedTestApp; let deployedTestApp;
let processUserModel; let processUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const nrOfProcesses = 20; const nrOfProcesses = 20;
let page; let page;
let totalPages; let totalPages;
e2e/process-services/sort-tasklist-pagination.e2e.ts
+1 -4
View File
@@ -19,11 +19,8 @@ import { LoginPage } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { PaginationPage } from '@alfresco/adf-testing'; import { PaginationPage } from '@alfresco/adf-testing';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { Util } from '../util/util'; import { Util } from '../util/util';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -36,7 +33,7 @@ describe('Task List Pagination - Sorting', () => {
const taskPage = new TasksPage(); const taskPage = new TasksPage();
const paginationPage = new PaginationPage(); const paginationPage = new PaginationPage();
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const nrOfTasks = 20; const nrOfTasks = 20;
let processUserModel; let processUserModel;
const taskNameBase = 'Task'; const taskNameBase = 'Task';
e2e/process-services/standalone-task.e2e.ts
+1 -6
View File
@@ -20,14 +20,9 @@ import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing'; import { LoginPage } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import Task = require('../models/APS/Task'); import Task = require('../models/APS/Task');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import fs = require('fs'); import fs = require('fs');
@@ -38,7 +33,7 @@ describe('Start Task - Task App', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
let processUserModel; let processUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const taskPage = new TasksPage(); const taskPage = new TasksPage();
const tasks = ['Standalone task', 'Completed standalone task', 'Add a form', 'Remove form']; const tasks = ['Standalone task', 'Completed standalone task', 'Add a form', 'Remove form'];
const noFormMessage = 'No forms attached'; const noFormMessage = 'No forms attached';
e2e/process-services/start-process-component.e2e.ts
+5 -9
View File
@@ -15,7 +15,6 @@
* limitations under the License. * limitations under the License.
*/ */
import resources = require('../util/resources');
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { LoginPage, StartProcessDialog, Widget, FileBrowserUtil } from '@alfresco/adf-testing'; import { LoginPage, StartProcessDialog, Widget, FileBrowserUtil } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -27,13 +26,10 @@ import { ProcessDetailsPage } from '../pages/adf/process-services/processDetails
import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { User } from '../models/APS/user'; import { User } from '../models/APS/user';
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import { FileModel } from '../models/ACS/fileModel'; import { FileModel } from '../models/ACS/fileModel';
import dateFormat = require('dateformat'); import dateFormat = require('dateformat');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { StringUtil } from '@alfresco/adf-testing'; import { StringUtil } from '@alfresco/adf-testing';
@@ -50,9 +46,9 @@ describe('Start Process Component', () => {
const startProcessDialog = new StartProcessDialog(); const startProcessDialog = new StartProcessDialog();
const apps = new AppsActions(); const apps = new AppsActions();
const widget = new Widget(); const widget = new Widget();
const app = resources.Files.APP_WITH_PROCESSES; const app = browser.params.resources.Files.APP_WITH_PROCESSES;
const simpleApp = resources.Files.WIDGETS_SMOKE_TEST; const simpleApp = browser.params.resources.Files.WIDGETS_SMOKE_TEST;
const dateFormApp = resources.Files.APP_WITH_DATE_FIELD_FORM; const dateFormApp = browser.params.resources.Files.APP_WITH_DATE_FIELD_FORM;
let appId, procUserModel, secondProcUserModel, tenantId, simpleAppCreated, dateFormAppCreated; let appId, procUserModel, secondProcUserModel, tenantId, simpleAppCreated, dateFormAppCreated;
const processModelWithSe = 'process_with_se', processModelWithoutSe = 'process_without_se'; const processModelWithSe = 'process_with_se', processModelWithoutSe = 'process_without_se';
const processName255Characters = StringUtil.generateRandomString(255); const processName255Characters = StringUtil.generateRandomString(255);
@@ -62,8 +58,8 @@ describe('Start Process Component', () => {
const auditLogFile = 'Audit.pdf'; const auditLogFile = 'Audit.pdf';
const jpgFile = new FileModel({ const jpgFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': resources.Files.ADF_DOCUMENTS.JPG.file_name 'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/process-services/start-task-custom-app.e2e.ts
+3 -8
View File
@@ -22,14 +22,9 @@ import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import { FileModel } from '../models/ACS/fileModel'; import { FileModel } from '../models/ACS/fileModel';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
@@ -44,7 +39,7 @@ describe('Start Task - Custom App', () => {
const processServiceTabBarPage = new ProcessServiceTabBarPage(); const processServiceTabBarPage = new ProcessServiceTabBarPage();
let processUserModel, assigneeUserModel; let processUserModel, assigneeUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const formTextField = app.form_fields.form_fieldId; const formTextField = app.form_fields.form_fieldId;
const formFieldValue = 'First value '; const formFieldValue = 'First value ';
const taskPage = new TasksPage(); const taskPage = new TasksPage();
@@ -53,8 +48,8 @@ describe('Start Task - Custom App', () => {
const showHeaderTask = 'Show Header'; const showHeaderTask = 'Show Header';
let appModel; let appModel;
const pngFile = new FileModel({ const pngFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.PNG.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location,
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/process-services/start-task-task-app.e2e.ts
+4 -11
View File
@@ -15,22 +15,15 @@
* limitations under the License. * limitations under the License.
*/ */
import { by } from 'protractor'; import { by, browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing'; import { LoginPage } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import { FileModel } from '../models/ACS/fileModel'; import { FileModel } from '../models/ACS/fileModel';
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { StringUtil } from '@alfresco/adf-testing'; import { StringUtil } from '@alfresco/adf-testing';
@@ -46,7 +39,7 @@ describe('Start Task - Task App', () => {
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
let processUserModel, assigneeUserModel; let processUserModel, assigneeUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const formTextField = app.form_fields.form_fieldId; const formTextField = app.form_fields.form_fieldId;
const formFieldValue = 'First value '; const formFieldValue = 'First value ';
const taskPage = new TasksPage(); const taskPage = new TasksPage();
@@ -57,8 +50,8 @@ describe('Start Task - Task App', () => {
const tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File']; const tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File'];
const showHeaderTask = 'Show Header'; const showHeaderTask = 'Show Header';
const jpgFile = new FileModel({ const jpgFile = new FileModel({
'location': resources.Files.ADF_DOCUMENTS.JPG.file_location, 'location': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_location,
'name': resources.Files.ADF_DOCUMENTS.JPG.file_name 'name': browser.params.resources.Files.ADF_DOCUMENTS.JPG.file_name
}); });
beforeAll(async () => { beforeAll(async () => {
e2e/process-services/task-attachmentList-actionMenu.e2e.ts
+3 -9
View File
@@ -16,20 +16,14 @@
*/ */
import { browser } from 'protractor'; import { browser } from 'protractor';
import { LoginPage, FileBrowserUtil } from '@alfresco/adf-testing'; import { LoginPage, FileBrowserUtil } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
import { ViewerPage } from '../pages/adf/viewerPage'; import { ViewerPage } from '../pages/adf/viewerPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import resources = require('../util/resources');
import path = require('path'); import path = require('path');
import fs = require('fs'); import fs = require('fs');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
@@ -42,10 +36,10 @@ describe('Attachment list action menu for tasks', () => {
const taskPage = new TasksPage(); const taskPage = new TasksPage();
const attachmentListPage = new AttachmentListPage(); const attachmentListPage = new AttachmentListPage();
const viewerPage = new ViewerPage(); const viewerPage = new ViewerPage();
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const pngFile = new FileModel({ const pngFile = new FileModel({
location: resources.Files.ADF_DOCUMENTS.PNG.file_location, location: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_location,
name: resources.Files.ADF_DOCUMENTS.PNG.file_name name: browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name
}); });
const downloadedPngFile = pngFile.name; const downloadedPngFile = pngFile.name;
let tenantId, appId, relatedContent, relatedContentId; let tenantId, appId, relatedContent, relatedContentId;
e2e/process-services/task-audit.e2e.ts
+1 -6
View File
@@ -18,14 +18,9 @@
import { LoginPage, BrowserActions, FileBrowserUtil } from '@alfresco/adf-testing'; import { LoginPage, BrowserActions, FileBrowserUtil } from '@alfresco/adf-testing';
import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant'; import { Tenant } from '../models/APS/tenant';
import { browser } from 'protractor'; import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions'; import { UsersActions } from '../actions/users.actions';
import { AppsActions } from '../actions/APS/apps.actions'; import { AppsActions } from '../actions/APS/apps.actions';
@@ -34,7 +29,7 @@ describe('Task Audit', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();
let processUserModel; let processUserModel;
const app = resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;
const taskPage = new TasksPage(); const taskPage = new TasksPage();
const processServices = new ProcessServicesPage(); const processServices = new ProcessServicesPage();
const taskTaskApp = 'Audit task task app'; const taskTaskApp = 'Audit task task app';

Some files were not shown because too many files have changed in this diff Show More