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

Multiple option env file (#4788)

Browse Source 
* multi configuration file enabling

* improve ignore

* update i18n tool dep

* update webbpack bundle analyzer version

* fix ps cloud test wait setting

* fix script content

* remove use of testconfig for browser options

* convert protractor to ts

* download browser util fix
This commit is contained in:
Eugenio Romano
2019-05-30 11:15:15 +01:00
committed by GitHub
parent 9aafb80483
commit b91a942aa1
156 changed files with 1227 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/actions/ACS/upload.actions.ts
+2 -2
View File
@@ -17,12 +17,12 @@
import path = require('path');
import fs = require('fs');
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
export class UploadActions {
async uploadFile(alfrescoJsApi, fileLocation, fileName, parentFolderId) {
const pathFile = path.join(TestConfig.main.rootPath + fileLocation);
const pathFile = path.join(browser.params.testConfig.main.rootPath + fileLocation);
const file = fs.createReadStream(pathFile);
return alfrescoJsApi.upload.uploadFile(
e2e/actions/APS/apps.actions.ts
+2 -3
View File
@@ -17,7 +17,6 @@
import path = require('path');
import fs = require('fs');
import TestConfig = require('../../test.config');
import AppPublish = require('../../models/APS/AppPublish');
import remote = require('selenium-webdriver/remote');
import { browser } from 'protractor';
@@ -63,7 +62,7 @@ export class AppsActions {
async importApp(alfrescoJsApi, appFileLocation) {
browser.setFileDetector(new remote.FileDetector());
const pathFile = path.join(TestConfig.main.rootPath + appFileLocation);
const pathFile = path.join(browser.params.testConfig.main.rootPath + appFileLocation);
const file = fs.createReadStream(pathFile);
return await alfrescoJsApi.activiti.appsApi.importAppDefinition(file);
@@ -82,7 +81,7 @@ export class AppsActions {
async importNewVersionAppDefinitionPublishDeployApp(alfrescoJsApi, appFileLocation, modelId) {
browser.setFileDetector(new remote.FileDetector());
const pathFile = path.join(TestConfig.main.rootPath + appFileLocation);
const pathFile = path.join(browser.params.testConfig.main.rootPath + appFileLocation);
const file = fs.createReadStream(pathFile);
const appCreated = await alfrescoJsApi.activiti.appsApi.importNewAppDefinition(modelId, file);
e2e/actions/drop.actions.ts
+3 -5
View File
@@ -15,11 +15,9 @@
* limitations under the License.
*/
import { browser } from 'protractor';
import fs = require('fs');
import path = require('path');
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import remote = require('selenium-webdriver/remote');
const JS_BIND_INPUT = function (target) {
@@ -81,7 +79,7 @@ export class DropActions {
dropFile(dropArea, filePath) {
browser.setFileDetector(new remote.FileDetector());
const absolutePath = path.resolve(path.join(TestConfig.main.rootPath, filePath));
const absolutePath = path.resolve(path.join(browser.params.testConfig.main.rootPath, filePath));
fs.accessSync(absolutePath, fs.constants.F_OK);
return dropArea.getWebElement().then((element) => {
@@ -95,7 +93,7 @@ export class DropActions {
dropFolder(dropArea, folderPath) {
browser.setFileDetector(new remote.FileDetector());
const absolutePath = path.resolve(path.join(TestConfig.main.rootPath, folderPath));
const absolutePath = path.resolve(path.join(browser.params.testConfig.main.rootPath, folderPath));
fs.accessSync(absolutePath, fs.constants.F_OK);
return dropArea.getWebElement().then((element) => {
e2e/actions/users.actions.ts
+1 -2
View File
@@ -17,7 +17,6 @@
import { Tenant } from '../models/APS/tenant';
import { User } from '../models/APS/user';
import TestConfig = require('../test.config');
import path = require('path');
import fs = require('fs');
import remote = require('selenium-webdriver/remote');
@@ -69,7 +68,7 @@ export class UsersActions {
async changeProfilePictureAps(alfrescoJsApi, fileLocation) {
browser.setFileDetector(new remote.FileDetector());
const pathFile = path.join(TestConfig.main.rootPath + fileLocation);
const pathFile = path.join(browser.params.testConfig.main.rootPath + fileLocation);
const file = fs.createReadStream(pathFile);
return alfrescoJsApi.activiti.profileApi.uploadProfilePicture(file);
e2e/content-services/comments/comment-component.e2e.ts
+5 -5
View File
@@ -24,7 +24,7 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import CONSTANTS = require('../../util/constants');
import { StringUtil } from '@alfresco/adf-testing';
@@ -66,10 +66,10 @@ describe('Comment Component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
done();
@@ -95,7 +95,7 @@ describe('Comment Component', () => {
afterEach(async (done) => {
try {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, nodeId);
} catch (error) {
@@ -181,7 +181,7 @@ describe('Comment Component', () => {
let site, pngUploadedFile;
beforeAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
title: StringUtil.generateRandomString(8),
e2e/content-services/directives/create-folder-directive.e2e.ts
+2 -3
View File
@@ -22,7 +22,6 @@ import { NotificationPage } from '../../pages/adf/notificationPage';
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser, Key } from 'protractor';
@@ -39,10 +38,10 @@ describe('Create folder directive', function () {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/directives/create-library-directive.e2e.ts
+3 -3
View File
@@ -21,7 +21,7 @@ import { CreateLibraryDialog } from '../../pages/adf/dialog/createLibraryDialog'
import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { StringUtil } from '@alfresco/adf-testing';
@@ -45,10 +45,10 @@ describe('Create library directive', function () {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/directives/download-directive.e2e.ts
+3 -3
View File
@@ -20,7 +20,7 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { LoginPage, FileBrowserUtil, BrowserVisibility } from '@alfresco/adf-testing';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -68,10 +68,10 @@ describe('Version component actions', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
e2e/content-services/document-list/document-list-actions.e2e.ts
+2 -3
View File
@@ -20,7 +20,6 @@ import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../../actions/ACS/upload.actions';
@@ -40,7 +39,7 @@ describe('Document List Component - Actions', () => {
const alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
describe('Document List Component - Check Actions', () => {
@@ -69,7 +68,7 @@ describe('Document List Component - Actions', () => {
beforeAll(async (done) => {
acsUser = new AcsUserModel();
folderName = `TATSUMAKY_${StringUtil.generateRandomString(5)}_SENPOUKYAKU`;
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await alfrescoJsApi.login(acsUser.id, acsUser.password);
pdfUploadedNode = await uploadActions.uploadFile(alfrescoJsApi, pdfFileModel.location, pdfFileModel.name, '-my-');
e2e/content-services/document-list/document-list-component.e2e.ts
+15 -15
View File
@@ -18,7 +18,7 @@
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { ViewerPage } from '../../pages/adf/viewerPage';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { LoginPage, StringUtil } from '@alfresco/adf-testing';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -38,12 +38,12 @@ describe('Document List Component', () => {
beforeAll(() => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
});
afterEach(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
if (uploadedFolder) {
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, uploadedFolder.entry.id);
uploadedFolder = null;
@@ -92,7 +92,7 @@ describe('Document List Component', () => {
/* cspell:disable-next-line */
folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -104,7 +104,7 @@ describe('Document List Component', () => {
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
if (pdfUploadedNode) {
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pdfUploadedNode.entry.id);
@@ -186,7 +186,7 @@ describe('Document List Component', () => {
const user = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(user);
@@ -202,7 +202,7 @@ describe('Document List Component', () => {
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
if (fileANode) {
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileANode.entry.id);
}
@@ -242,7 +242,7 @@ describe('Document List Component', () => {
xit('[C260121] Should show the spinner on content loading', async (done) => {
acsUser = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.clickOnContentServices();
@@ -254,7 +254,7 @@ describe('Document List Component', () => {
acsUser = new AcsUserModel();
const folderName = 'BANANA';
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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 loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.goToDocumentList();
@@ -273,7 +273,7 @@ describe('Document List Component', () => {
acsUser = new AcsUserModel();
/* cspell:disable-next-line */
const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
uploadedFolder = await uploadActions.createFolder(this.alfrescoJsApi, folderName, '-my-');
@@ -288,7 +288,7 @@ describe('Document List Component', () => {
it('[C261997] Should be able to clean Recent Files history', async (done) => {
acsUser = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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 loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.clickOnContentServices();
@@ -305,7 +305,7 @@ describe('Document List Component', () => {
acsUser = new AcsUserModel();
const folderNameA = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
const folderNameB = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
uploadedFolder = await uploadActions.createFolder(this.alfrescoJsApi, folderNameA, '-my-');
@@ -329,7 +329,7 @@ describe('Document List Component', () => {
'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location
});
acsUser = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
testFileNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFileA.location, testFileA.name, '-my-');
@@ -350,7 +350,7 @@ describe('Document List Component', () => {
beforeAll(async (done) => {
acsUser = new AcsUserModel();
folderCreated = [];
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
let folderName = '';
@@ -392,7 +392,7 @@ describe('Document List Component', () => {
beforeAll(async (done) => {
acsUser = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
file = await uploadActions.uploadFile(this.alfrescoJsApi, file0BytesModel.location, file0BytesModel.name, '-my-');
e2e/content-services/document-list/document-list-copy-move.e2e.ts
+4 -5
View File
@@ -15,11 +15,10 @@
* limitations under the License.
*/
import { by, element } from 'protractor';
import { by, element, browser } from 'protractor';
import { LoginPage, PaginationPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../../actions/ACS/upload.actions';
import { StringUtil } from '@alfresco/adf-testing';
@@ -43,7 +42,7 @@ describe('Document List Component - Actions', () => {
const alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
describe('Folder Actions - Copy and Move', () => {
@@ -62,7 +61,7 @@ describe('Document List Component - Actions', () => {
beforeAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.core.peopleApi.addPerson(contentServicesUser);
await alfrescoJsApi.login(contentServicesUser.id, contentServicesUser.password);
folder1 = await uploadActions.createFolder(alfrescoJsApi, 'A' + folderModel1.name, '-my-');
@@ -84,7 +83,7 @@ describe('Document List Component - Actions', () => {
});
afterAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await folders.forEach(function (folder) {
uploadActions.deleteFilesOrFolder(alfrescoJsApi, folder.entry.id);
});
e2e/content-services/document-list/document-list-gallery.e2e.ts
+4 -4
View File
@@ -17,7 +17,7 @@
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { LoginPage, StringUtil } from '@alfresco/adf-testing';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -36,7 +36,7 @@ describe('Document List Component', () => {
beforeAll(() => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
});
@@ -71,7 +71,7 @@ describe('Document List Component', () => {
beforeAll(async (done) => {
acsUser = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
funnyUser = await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
await this.alfrescoJsApi.login(acsUser.id, acsUser.password);
filePdfNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFile.location, pdfFile.name, '-my-');
@@ -172,7 +172,7 @@ describe('Document List Component', () => {
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
if (filePdfNode) {
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, filePdfNode.entry.id);
}
e2e/content-services/document-list/document-list-pagination.e2e.ts
+2 -3
View File
@@ -22,7 +22,6 @@ import { PaginationPage } from '@alfresco/adf-testing';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FolderModel } from '../../models/ACS/folderModel';
import TestConfig = require('../../test.config');
import { Util } from '../../util/util';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -70,10 +69,10 @@ describe('Document List - Pagination', function () {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/document-list/document-list-permissions.e2e.ts
+5 -6
View File
@@ -19,7 +19,6 @@ import { browser } from 'protractor';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { LoginPage, ErrorPage, StringUtil, BrowserActions } from '@alfresco/adf-testing';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -35,7 +34,7 @@ describe('Document List Component', () => {
beforeAll(() => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
});
@@ -46,7 +45,7 @@ describe('Document List Component', () => {
const siteName = `PRIVATE_TEST_SITE_${StringUtil.generateRandomString(5)}`;
const privateSiteBody = { visibility: 'PRIVATE', title: siteName };
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -65,7 +64,7 @@ describe('Document List Component', () => {
});
it('[C217334] Should display a message when accessing file without permissions', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/files/' + privateSite.entry.guid);
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid);
expect(errorPage.getErrorCode()).toBe('403');
expect(errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.');
});
@@ -73,7 +72,7 @@ describe('Document List Component', () => {
it('[C279924] Should display custom message when accessing a file without permissions', () => {
contentServicesPage.goToDocumentList();
contentServicesPage.enableCustomPermissionMessage();
BrowserActions.getUrl(TestConfig.adf.url + '/files/' + privateSite.entry.guid);
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid);
expect(errorPage.getErrorCode()).toBe('403');
});
@@ -81,7 +80,7 @@ describe('Document List Component', () => {
navBar.openLanguageMenu();
navBar.chooseLanguage('Italiano');
browser.sleep(2000);
BrowserActions.getUrl(TestConfig.adf.url + '/files/' + privateSite.entry.guid);
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid);
expect(errorPage.getErrorDescription()).toBe('Accesso alla risorsa sul server non consentito.');
});
e2e/content-services/document-list/document-list-properties.e2e.ts
+4 -4
View File
@@ -20,7 +20,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -46,7 +46,7 @@ describe('Document List Component - Properties', () => {
beforeAll(() => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
});
@@ -55,7 +55,7 @@ describe('Document List Component - Properties', () => {
beforeEach(async (done) => {
acsUser = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -71,7 +71,7 @@ describe('Document List Component - Properties', () => {
});
afterEach(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, subFolder.entry.id);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, parentFolder.entry.id);
done();
e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts
+5 -5
View File
@@ -17,7 +17,7 @@
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { LoginPage, StringUtil } from '@alfresco/adf-testing';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -36,12 +36,12 @@ describe('Document List Component', () => {
beforeAll(() => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
});
afterEach(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
if (uploadedFolder) {
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, uploadedFolder.entry.id);
uploadedFolder = null;
@@ -82,7 +82,7 @@ describe('Document List Component', () => {
beforeAll(async (done) => {
acsUser = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -96,7 +96,7 @@ describe('Document List Component', () => {
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
if (filePdfNode) {
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, filePdfNode.entry.id);
}
e2e/content-services/lock-file.e2e.ts
+3 -3
View File
@@ -27,7 +27,7 @@ import { FileModel } from '../models/ACS/fileModel';
import CONSTANTS = require('../util/constants');
import { StringUtil } from '@alfresco/adf-testing';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -59,10 +59,10 @@ describe('Lock File', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(adminUser);
await this.alfrescoJsApi.core.peopleApi.addPerson(managerUser);
e2e/content-services/metadata/aspect-oriented-config.e2e.ts
+3 -3
View File
@@ -23,7 +23,7 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -53,10 +53,10 @@ describe('Aspect oriented config', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
try {
await this.alfrescoJsApi.core.customModelApi.createCustomModel('ACTIVE', modelOneName, modelOneName, modelOneName, modelOneName);
e2e/content-services/metadata/metadata-permissions.e2e.ts
+3 -3
View File
@@ -23,7 +23,7 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -68,10 +68,10 @@ describe('permissions', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(consumerUser);
await this.alfrescoJsApi.core.peopleApi.addPerson(collaboratorUser);
e2e/content-services/metadata/metadata-properties.e2e.ts
+3 -3
View File
@@ -22,7 +22,7 @@ import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -65,10 +65,10 @@ describe('CardView Component - properties', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/metadata/metadata-smoke-tests.e2e.ts
+5 -5
View File
@@ -23,7 +23,7 @@ import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import dateFormat = require('dateformat');
@@ -67,10 +67,10 @@ describe('Metadata component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -294,9 +294,9 @@ describe('Metadata component', () => {
});
it('[C279960] Should show the last username modifier when modify a File', async () => {
await loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await loginPage.loginToContentServices(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
BrowserActions.getUrl(TestConfig.adf.url + `/(overlay:files/${pngFileModel.id}/view)`);
BrowserActions.getUrl(browser.params.testConfig.adf.url + `/(overlay:files/${pngFileModel.id}/view)`);
viewerPage.clickInfoButton();
viewerPage.checkInfoSideBarIsDisplayed();
e2e/content-services/notifications-component.e2e.ts
+2 -3
View File
@@ -17,7 +17,6 @@
import { LoginPage } from '@alfresco/adf-testing';
import { AcsUserModel } from '../models/ACS/acsUserModel';
import TestConfig = require('../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NotificationPage } from '../pages/adf/notificationPage';
import { browser } from 'protractor';
@@ -33,10 +32,10 @@ describe('Notifications Component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/permissions/permissions-component.e2e.ts
+3 -4
View File
@@ -19,7 +19,6 @@ import { PermissionsPage } from '../../pages/adf/permissionsPage';
import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel';
@@ -70,7 +69,7 @@ describe('Permissions Component', function () {
const alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
const roleConsumerFolderModel = new FolderModel({ 'name': 'roleConsumer' + StringUtil.generateRandomString() });
@@ -89,7 +88,7 @@ describe('Permissions Component', function () {
beforeAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.core.peopleApi.addPerson(fileOwnerUser);
await alfrescoJsApi.core.peopleApi.addPerson(filePermissionUser);
@@ -173,7 +172,7 @@ describe('Permissions Component', function () {
});
afterAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await folders.forEach(function (folder) {
uploadActions.deleteFilesOrFolder(alfrescoJsApi, folder.entry.id);
});
e2e/content-services/permissions/site-permissions.e2e.ts
+4 -5
View File
@@ -19,7 +19,6 @@ import { PermissionsPage } from '../../pages/adf/permissionsPage';
import { LoginPage, BrowserActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { FileModel } from '../../models/ACS/fileModel';
@@ -69,7 +68,7 @@ describe('Permissions Component', function () {
const alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
let siteFolder, privateSiteFile;
@@ -83,7 +82,7 @@ describe('Permissions Component', function () {
beforeAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.core.peopleApi.addPerson(folderOwnerUser);
await alfrescoJsApi.core.peopleApi.addPerson(siteConsumerUser);
@@ -153,7 +152,7 @@ describe('Permissions Component', function () {
});
afterAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.core.sitesApi.deleteSite(publicSite.entry.id);
await alfrescoJsApi.core.sitesApi.deleteSite(privateSite.entry.id);
@@ -165,7 +164,7 @@ describe('Permissions Component', function () {
beforeAll(async (done) => {
await loginPage.loginToContentServicesUsingUserModel(folderOwnerUser);
await BrowserActions.getUrl(TestConfig.adf.url + '/files/' + publicSite.entry.guid);
await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + publicSite.entry.guid);
done();
});
e2e/content-services/share-file/share-file.e2e.ts
+4 -4
View File
@@ -24,7 +24,7 @@ import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -52,10 +52,10 @@ describe('Share file', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
@@ -74,7 +74,7 @@ describe('Share file', () => {
afterAll(async (done) => {
try {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, nodeId);
} catch (error) {
}
e2e/content-services/share-file/unshare-file.e2e.ts
+3 -4
View File
@@ -23,7 +23,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../../actions/ACS/upload.actions';
@@ -71,10 +70,10 @@ describe('Unshare file', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
testSite = await this.alfrescoJsApi.core.sitesApi.createSite(site);
@@ -160,7 +159,7 @@ describe('Unshare file', () => {
describe('without permission', () => {
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.sitesApi.deleteSite(siteName, { permanent: true });
done();
});
e2e/content-services/sso/sso-download-directive-component.e2e.ts
+10 -7
View File
@@ -16,7 +16,6 @@
*/
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ApiService, LoginSSOPage } from '@alfresco/adf-testing';
@@ -54,10 +53,10 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url,
hostEcm: browser.params.testConfig.adf.url,
authType: 'OAUTH',
oauth2: {
host: TestConfig.adf.hostSso,
host: browser.params.testConfig.adf.hostSso,
clientId: 'alfresco',
scope: 'openid',
secret: '',
@@ -77,8 +76,8 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
describe('SSO in ADF using ACS and AIS, implicit flow set', () => {
beforeAll(async (done) => {
const apiService = new ApiService('alfresco', TestConfig.adf.url, TestConfig.adf.hostSso, 'ECM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const apiService = new ApiService('alfresco', browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM');
await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
identityService = new IdentityService(apiService);
@@ -93,7 +92,11 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
silentLogin = false;
implicitFlow = true;
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco');
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity,
silentLogin, implicitFlow, 'alfresco');
loginSsoPage.clickOnSSOButton();
loginSsoPage.loginSSOIdentityService(acsUser.id, acsUser.password);
@@ -106,7 +109,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
afterAll(async (done) => {
try {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, folder.entry.id);
await identityService.deleteIdentityUser(acsUser.id);
} catch (error) {
e2e/content-services/tag-component.e2e.ts
+2 -3
View File
@@ -22,7 +22,6 @@ import { LoginPage } from '@alfresco/adf-testing';
import { TagPage } from '../pages/adf/tagPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -65,10 +64,10 @@ xdescribe('Tag component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/trashcan-pagination.e2e.ts
+2 -3
View File
@@ -24,7 +24,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FolderModel } from '../models/ACS/folderModel';
import TestConfig = require('../test.config');
import { Util } from '../util/util';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -65,10 +64,10 @@ describe('Trashcan - Pagination', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/tree-view-component.e2e.ts
+4 -4
View File
@@ -21,7 +21,7 @@ import { TreeViewPage } from '../pages/adf/content-services/treeViewPage';
import { AcsUserModel } from '../models/ACS/acsUserModel';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UploadActions } from '../actions/ACS/upload.actions';
@@ -49,10 +49,10 @@ describe('Tree View Component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
@@ -84,7 +84,7 @@ describe('Tree View Component', () => {
afterAll(async (done) => {
try {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, treeFolder.entry.id);
await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, secondTreeFolder.entry.id);
e2e/content-services/upload/cancel-upload.e2e.ts
+2 -3
View File
@@ -25,7 +25,6 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -56,10 +55,10 @@ describe('Upload component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/upload/excluded-file.e2e.ts
+2 -3
View File
@@ -26,7 +26,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { FolderModel } from '../../models/ACS/folderModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -63,10 +62,10 @@ describe('Upload component - Excluded Files', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/upload/remove-upload.e2e.ts
+4 -4
View File
@@ -23,7 +23,7 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -48,12 +48,12 @@ describe('Upload component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(
TestConfig.adf.adminEmail,
TestConfig.adf.adminPassword
browser.params.testConfig.adf.adminEmail,
browser.params.testConfig.adf.adminPassword
);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/upload/upload-dialog.ts
+3 -3
View File
@@ -23,7 +23,7 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -64,10 +64,10 @@ describe('Upload component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/upload/uploader-component.e2e.ts
+2 -3
View File
@@ -26,7 +26,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { FolderModel } from '../../models/ACS/folderModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { StringUtil } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -83,10 +82,10 @@ describe('Upload component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/upload/user-permission.e2e.ts
+2 -3
View File
@@ -30,7 +30,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import { FolderModel } from '../../models/ACS/folderModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -71,7 +70,7 @@ describe('Upload - User permission', () => {
beforeAll(() => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
});
@@ -79,7 +78,7 @@ describe('Upload - User permission', () => {
acsUser = new AcsUserModel();
acsUserTwo = new AcsUserModel();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/version/version-actions.e2e.ts
+2 -3
View File
@@ -24,7 +24,6 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -65,10 +64,10 @@ describe('Version component actions', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/version/version-permissions.e2e.ts
+3 -3
View File
@@ -27,7 +27,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -76,10 +76,10 @@ describe('Version component permissions', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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(consumerUser);
e2e/content-services/version/version-properties.e2e.ts
+3 -4
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { by, element } from 'protractor';
import { by, element, browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
@@ -24,7 +24,6 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -57,10 +56,10 @@ describe('Version Properties', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/content-services/version/version-smoke-tests.e2e.ts
+2 -3
View File
@@ -24,7 +24,6 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -73,10 +72,10 @@ describe('Version component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/core/auth-guard/auth-guard-sso.e2e.ts
+7 -4
View File
@@ -16,7 +16,6 @@
*/
import { ErrorPage, LoginSSOPage, SettingsPage, BrowserActions } from '@alfresco/adf-testing';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
describe('Auth Guard SSO', () => {
@@ -26,10 +25,14 @@ describe('Auth Guard SSO', () => {
const errorPage = new ErrorPage();
it('[C307058] Should be redirected to 403 when user doesn\'t have permissions', async () => {
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false, true, 'alfresco');
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity,
false, true, 'alfresco');
loginSSOPage.clickOnSSOButton();
await loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
BrowserActions.getUrl(TestConfig.adf.url + '/cloud/simple-app');
await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/cloud/simple-app');
browser.driver.sleep(1000);
expect(errorPage.getErrorCode()).toBe('403');
});
e2e/core/card-view/card-view-component.e2e.ts
+2 -3
View File
@@ -15,13 +15,12 @@
* limitations under the License.
*/
import { element, by } from 'protractor';
import { element, by, browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import TestConfig = require('../../test.config');
import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage';
import { BrowserVisibility } from '@alfresco/adf-testing';
@@ -32,7 +31,7 @@ describe('CardView Component', () => {
const metadataViewPage = new MetadataViewPage();
beforeAll(async (done) => {
loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
loginPage.loginToContentServices(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
navigationBarPage.clickCardViewButton();
done();
e2e/core/datatable/data-table-component-selection.e2e.ts
+3 -3
View File
@@ -18,7 +18,7 @@
import { LoginPage } from '@alfresco/adf-testing';
import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
import { DataTableComponentPage } from '@alfresco/adf-testing';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -35,10 +35,10 @@ describe('Datatable component - selection', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/core/datatable/data-table-component.e2e.ts
+3 -3
View File
@@ -19,7 +19,7 @@ import { LoginPage } from '@alfresco/adf-testing';
import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
import { DataTableComponentPage } from '@alfresco/adf-testing';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -47,10 +47,10 @@ describe('Datatable component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/core/error-component.e2e.ts
+9 -10
View File
@@ -17,7 +17,6 @@
import { LoginPage, ErrorPage, BrowserActions } from '@alfresco/adf-testing';
import { AcsUserModel } from '../models/ACS/acsUserModel';
import TestConfig = require('../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { browser } from 'protractor';
@@ -30,10 +29,10 @@ describe('Error Component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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 loginPage.loginToContentServicesUsingUserModel(acsUser);
@@ -42,37 +41,37 @@ describe('Error Component', () => {
});
it('[C277302] Should display the error 403 when access to unauthorized page - My Change', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/error/403');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/403');
expect(errorPage.getErrorCode()).toBe('403');
expect(errorPage.getErrorTitle()).toBe('You don\'t have permission to access this server.');
expect(errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.');
});
it('[C280563] Should back home button navigate to the home page', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/error/404');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/404');
errorPage.clickBackButton();
expect(browser.getCurrentUrl()).toBe(TestConfig.adf.url + '/');
expect(browser.getCurrentUrl()).toBe(browser.params.testConfig.adf.url + '/');
});
it('[C280564] Should secondary button by default redirect to report-issue URL', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/error/403');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/403');
errorPage.clickSecondButton();
expect(browser.getCurrentUrl()).toBe(TestConfig.adf.url + '/report-issue');
expect(browser.getCurrentUrl()).toBe(browser.params.testConfig.adf.url + '/report-issue');
});
it('[C277304] Should display the error 404 when access to not found page', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/error/404');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/404');
expect(errorPage.getErrorCode()).toBe('404');
expect(errorPage.getErrorTitle()).toBe('An error occurred.');
expect(errorPage.getErrorDescription()).toBe('We couldn’t find the page you were looking for.');
});
it('[C307029] Should display Unknown message when error is undefined', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/error/501');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/501');
expect(errorPage.getErrorCode()).toBe('UNKNOWN');
expect(errorPage.getErrorTitle()).toBe('We hit a problem.');
expect(errorPage.getErrorDescription()).toBe('Looks like something went wrong.');
e2e/core/header-component.e2e.ts
+4 -4
View File
@@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { HeaderPage, SettingsPage } from '@alfresco/adf-testing';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
@@ -49,12 +49,12 @@ describe('Header Component', () => {
beforeAll(async(done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
const users = new UsersActions();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -73,7 +73,7 @@ describe('Header Component', () => {
});
afterAll(async(done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
done();
});
e2e/core/icons-component.e2e.ts
+3 -3
View File
@@ -20,7 +20,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { IconsPage } from '../pages/adf/iconsPage';
import { AcsUserModel } from '../models/ACS/acsUserModel';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
describe('Universal Icon component', function () {
@@ -33,10 +33,10 @@ describe('Universal Icon component', function () {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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 loginPage.loginToContentServicesUsingUserModel(acsUser);
e2e/core/infinite-scrolling.e2e.ts
+3 -3
View File
@@ -23,7 +23,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { AcsUserModel } from '../models/ACS/acsUserModel';
import { FolderModel } from '../models/ACS/folderModel';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { Util } from '../util/util';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -57,10 +57,10 @@ describe('Enable infinite scrolling', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/core/login/login-component.e2e.ts
+11 -12
View File
@@ -24,7 +24,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { UserInfoPage } from '@alfresco/adf-testing';
import TestConfig = require('../../test.config');
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -41,8 +40,8 @@ describe('Login component', () => {
const loginPage = new LoginPage();
const errorPage = new ErrorPage();
const adminUserModel = new AcsUserModel({
'id': TestConfig.adf.adminUser,
'password': TestConfig.adf.adminPassword
'id': browser.params.testConfig.adf.adminUser,
'password': browser.params.testConfig.adf.adminPassword
});
const userA = new AcsUserModel();
@@ -60,11 +59,11 @@ describe('Login component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ALL',
hostEcm: TestConfig.adf.url,
hostBpm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url,
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(userA);
await this.alfrescoJsApi.core.peopleApi.addPerson(userB);
@@ -191,7 +190,7 @@ describe('Login component', () => {
expect(loginPage.getSignInButtonIsEnabled()).toBe(false);
loginPage.clickSettingsIcon();
settingsPage.setProviderEcm();
loginPage.login(TestConfig.adf.adminUser, TestConfig.adf.adminPassword);
loginPage.login(browser.params.testConfig.adf.adminUser, browser.params.testConfig.adf.adminPassword);
navigationBarPage.clickContentServicesButton();
contentServicesPage.checkAcsContainer();
});
@@ -218,7 +217,7 @@ describe('Login component', () => {
settingsPage.setProviderEcmBpm();
loginPage.login(adminUserModel.id, adminUserModel.password);
browser.executeScript('window.localStorage.removeItem("ticket-ECM");');
BrowserActions.getUrl(TestConfig.adf.url + '/files');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
loginPage.waitForElements();
});
@@ -238,7 +237,7 @@ describe('Login component', () => {
settingsPage.setProviderEcmBpm();
loginPage.login(adminUserModel.id, adminUserModel.password);
browser.executeScript('window.localStorage.removeItem("ticket-BPM");');
BrowserActions.getUrl(TestConfig.adf.url + '/activiti');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
loginPage.waitForElements();
});
@@ -253,9 +252,9 @@ describe('Login component', () => {
browser.getAllWindowHandles().then((handles) => {
browser.switchTo().window(handles[1]).then(() => {
BrowserActions.getUrl(TestConfig.adf.url + '/activiti');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
processServicesPage.checkApsContainer();
BrowserActions.getUrl(TestConfig.adf.url + '/files');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
contentServicesPage.checkAcsContainer();
});
});
@@ -271,7 +270,7 @@ describe('Login component', () => {
});
it('[C291854] Should be possible login in valid credentials', () => {
BrowserActions.getUrl(TestConfig.adf.url);
BrowserActions.getUrl(browser.params.testConfig.adf.url);
loginPage.waitForElements();
expect(loginPage.getSignInButtonIsEnabled()).toBe(false);
loginPage.enterUsername(invalidUsername);
e2e/core/login/login-sso/login-sso.e2e.ts
+26 -15
View File
@@ -16,7 +16,6 @@
*/
import { LoginSSOPage, SettingsPage, LoginPage } from '@alfresco/adf-testing';
import TestConfig = require('../../../test.config');
import { browser } from 'protractor';
import { NavigationBarPage } from '../../../pages/adf/navigationBarPage';
@@ -39,21 +38,27 @@ describe('Login component - SSO', () => {
});
it('[C261050] Should be possible login with SSO', () => {
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false, true, 'alfresco');
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco');
loginSSOPage.clickOnSSOButton();
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
});
it('[C280667] Should be redirect directly to keycloak without show the login page with silent login', () => {
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, true, true, 'alfresco');
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, true, true, 'alfresco');
loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
});
});
describe('SSO Login Error for login component', () => {
it('[C299205] Should display the login error message when the SSO identity service is wrongly configured', async() => {
await settingsPage.setProviderEcmSso(TestConfig.adf.url, 'http://aps22/auth/realms/alfresco', TestConfig.adf.hostIdentity, false, true, 'alfresco');
it('[C299205] Should display the login error message when the SSO identity service is wrongly configured', async () => {
await settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
'http://aps22/auth/realms/alfresco',
browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco');
await loginSSOPage.clickOnSSOButton();
await loginSSOPage.checkLoginErrorIsDisplayed();
expect(loginSSOPage.getLoginErrorMessage()).toContain('SSO Authentication server unreachable');
@@ -64,15 +69,19 @@ describe('Login component - SSO', () => {
it('[C299158] Should be possible to login with SSO, with grant type password (Implicit Flow false)', () => {
implicitFlow = false;
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco');
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco');
loginPage.waitForElements();
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco');
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco');
browser.ignoreSynchronization = true;
loginPage.enterUsername(TestConfig.adf.adminEmail);
loginPage.enterPassword(TestConfig.adf.adminPassword);
loginPage.enterUsername(browser.params.testConfig.adf.adminEmail);
loginPage.enterPassword(browser.params.testConfig.adf.adminPassword);
loginPage.clickSignInButton();
let isDisplayed = false;
@@ -87,18 +96,20 @@ describe('Login component - SSO', () => {
}
);
return isDisplayed;
}, TestConfig.main.timeout, 'Element is not visible ' + loginPage.header.locator());
}, browser.params.testConfig.main.timeout, 'Element is not visible ' + loginPage.header.locator());
});
});
it('[C280665] Should be possible change the logout redirect URL', () => {
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false, true, 'alfresco', '/login');
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco', '/login');
loginSSOPage.clickOnSSOButton();
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
navigationBarPage.clickLogoutButton();
browser.getCurrentUrl().then((actualUrl) => {
expect(actualUrl).toEqual(TestConfig.adf.url + '/login');
expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/login');
});
});
e2e/core/login/redirection.e2e.ts
+9 -10
View File
@@ -22,7 +22,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ProcessServicesPage } from '../../pages/adf/process-services/processServicesPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import TestConfig = require('../../test.config');
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -41,8 +40,8 @@ describe('Login component - Redirect', () => {
const user = new AcsUserModel();
const userFolderOwner = new AcsUserModel();
const adminUserModel = new AcsUserModel({
'id': TestConfig.adf.adminUser,
'password': TestConfig.adf.adminPassword
'id': browser.params.testConfig.adf.adminUser,
'password': browser.params.testConfig.adf.adminPassword
});
let uploadedFolder;
const uploadActions = new UploadActions();
@@ -51,11 +50,11 @@ describe('Login component - Redirect', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url,
hostBpm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url,
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(user);
await this.alfrescoJsApi.core.peopleApi.addPerson(userFolderOwner);
@@ -123,7 +122,7 @@ describe('Login component - Redirect', () => {
navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
browser.getCurrentUrl().then((actualUrl) => {
expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id);
expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
});
contentServicesPage.waitForTableBody();
@@ -139,7 +138,7 @@ describe('Login component - Redirect', () => {
loginPage.login(user.id, user.password);
browser.getCurrentUrl().then((actualUrl) => {
expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id);
expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
});
});
@@ -153,7 +152,7 @@ describe('Login component - Redirect', () => {
navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id);
browser.getCurrentUrl().then((actualUrl) => {
expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id);
expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
});
contentServicesPage.waitForTableBody();
@@ -174,7 +173,7 @@ describe('Login component - Redirect', () => {
navigationBarPage.checkMenuButtonIsDisplayed();
browser.getCurrentUrl().then((actualUrl) => {
expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id);
expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id);
});
});
e2e/core/pagination-empty-current-page.e2e.ts
+3 -3
View File
@@ -29,7 +29,7 @@ import { UploadActions } from '../actions/ACS/upload.actions';
import { Util } from '../util/util';
import resources = require('../util/resources');
import TestConfig = require('../test.config');
import { browser } from 'protractor';
describe('Pagination - returns to previous page when current is empty', () => {
@@ -70,10 +70,10 @@ describe('Pagination - returns to previous page when current is empty', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/core/settings-component.e2e.ts
+17 -17
View File
@@ -21,7 +21,7 @@ import { AcsUserModel } from '../models/ACS/acsUserModel';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import { ContentServicesPage } from '../pages/adf/contentServicesPage';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
describe('Settings component', () => {
@@ -34,8 +34,8 @@ describe('Settings component', () => {
'Possible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.';
const adminUserModel = new AcsUserModel({
'id': TestConfig.adf.adminUser,
'password': TestConfig.adf.adminPassword
'id': browser.params.testConfig.adf.adminUser,
'password': browser.params.testConfig.adf.adminPassword
});
describe('Should be able to change Urls in the Settings', () => {
@@ -78,8 +78,8 @@ describe('Settings component', () => {
loginPage.waitForElements();
settingsPage.goToSettingsPage();
expect(settingsPage.getSelectedOptionText()).toEqual('ALL', 'The Settings changes are not saved');
expect(settingsPage.getBpmHostUrl()).toEqual(TestConfig.adf.url, 'The BPM Settings changes are not saved');
expect(settingsPage.getEcmHostUrl()).toEqual(TestConfig.adf.url, 'The ECM Settings changes are not saved');
expect(settingsPage.getBpmHostUrl()).toEqual(browser.params.testConfig.adf.url, 'The BPM Settings changes are not saved');
expect(settingsPage.getEcmHostUrl()).toEqual(browser.params.testConfig.adf.url, 'The ECM Settings changes are not saved');
});
@@ -126,8 +126,8 @@ describe('Settings component', () => {
beforeAll( (done) => {
settingsPage.goToSettingsPage();
settingsPage.setProvider(settingsPage.getEcmAndBpmOption(), 'ALL');
settingsPage.setContentServicesURL(TestConfig.adf.url);
settingsPage.setProcessServicesURL(TestConfig.adf.url);
settingsPage.setContentServicesURL(browser.params.testConfig.adf.url);
settingsPage.setProcessServicesURL(browser.params.testConfig.adf.url);
settingsPage.clickApply();
done();
});
@@ -143,8 +143,8 @@ describe('Settings component', () => {
settingsPage.checkProviderOptions();
settingsPage.checkBasicAuthRadioIsSelected();
settingsPage.checkSsoRadioIsNotSelected();
expect(settingsPage.getEcmHostUrl()).toBe(TestConfig.adf.url);
expect(settingsPage.getBpmHostUrl()).toBe(TestConfig.adf.url);
expect(settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.adf.url);
expect(settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.adf.url);
expect(settingsPage.getBackButton().isEnabled()).toBe(true);
expect(settingsPage.getApplyButton().isEnabled()).toBe(true);
loginPage.goToLoginPage();
@@ -167,12 +167,12 @@ describe('Settings component', () => {
expect(settingsPage.getSelectedOptionText()).toBe('BPM');
settingsPage.checkBasicAuthRadioIsSelected();
settingsPage.checkSsoRadioIsNotSelected();
expect(settingsPage.getBpmHostUrl()).toBe(TestConfig.adf.url);
expect(settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.adf.url);
expect(settingsPage.getBackButton().isEnabled()).toBe(true);
expect(settingsPage.getApplyButton().isEnabled()).toBe(true);
settingsPage.clickBackButton();
loginPage.waitForElements();
BrowserActions.getUrl(TestConfig.adf.url + '/activiti');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
processServicesPage.checkApsContainer();
processServicesPage.checkAppIsDisplayed('Task App');
});
@@ -194,12 +194,12 @@ describe('Settings component', () => {
expect(settingsPage.getSelectedOptionText()).toBe('ECM');
settingsPage.checkBasicAuthRadioIsSelected();
settingsPage.checkSsoRadioIsNotSelected();
expect(settingsPage.getEcmHostUrl()).toBe(TestConfig.adf.url);
expect(settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.adf.url);
expect(settingsPage.getBackButton().isEnabled()).toBe(true);
expect(settingsPage.getApplyButton().isEnabled()).toBe(true);
settingsPage.clickBackButton();
loginPage.waitForElements();
BrowserActions.getUrl(TestConfig.adf.url + '/files');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
contentServicesPage.checkAcsContainer();
});
@@ -223,15 +223,15 @@ describe('Settings component', () => {
expect(settingsPage.getSelectedOptionText()).toBe('ALL');
settingsPage.checkBasicAuthRadioIsSelected();
settingsPage.checkSsoRadioIsNotSelected();
expect(settingsPage.getEcmHostUrl()).toBe(TestConfig.adf.url);
expect(settingsPage.getBpmHostUrl()).toBe(TestConfig.adf.url);
expect(settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.adf.url);
expect(settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.adf.url);
expect(settingsPage.getBackButton().isEnabled()).toBe(true);
expect(settingsPage.getApplyButton().isEnabled()).toBe(true);
settingsPage.clickBackButton();
loginPage.waitForElements();
BrowserActions.getUrl(TestConfig.adf.url + '/files');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files');
contentServicesPage.checkAcsContainer();
BrowserActions.getUrl(TestConfig.adf.url + '/activiti');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti');
processServicesPage.checkApsContainer();
processServicesPage.checkAppIsDisplayed('Task App');
});
e2e/core/user-info-component-cloud.e2e.ts
+6 -4
View File
@@ -16,7 +16,7 @@
*/
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { UserInfoPage } from '@alfresco/adf-testing';
import { IdentityService, ApiService } from '@alfresco/adf-testing';
@@ -29,14 +29,16 @@ describe('User Info - SSO', () => {
let identityService: IdentityService;
beforeAll(async (done) => {
const apiService = new ApiService('alfresco', TestConfig.adf.url, TestConfig.adf.hostSso, 'ECM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const apiService = new ApiService('alfresco', browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM');
await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
identityService = new IdentityService(apiService);
identityUser = await identityService.createIdentityUser();
silentLogin = false;
settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, true, 'alfresco');
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, true, 'alfresco');
loginSSOPage.clickOnSSOButton();
e2e/core/user-info-component.e2e.ts
+4 -4
View File
@@ -23,7 +23,7 @@ import { FileModel } from '../models/ACS/fileModel';
import PeopleAPI = require('../restAPI/ACS/PeopleAPI');
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -48,11 +48,11 @@ describe('User Info component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ALL',
hostEcm: TestConfig.adf.url,
hostBpm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url,
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
e2e/core/viewer/file-extensions/viewer-arcive.component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
@@ -49,10 +49,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/file-extensions/viewer-component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
@@ -58,10 +58,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
@@ -49,10 +49,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
@@ -54,10 +54,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts
+2 -4
View File
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import TestConfig = require('../../../test.config');
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
import { ContentServicesPage } from '../../../pages/adf/contentServicesPage';
@@ -50,10 +48,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
@@ -49,10 +49,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../../pages/adf/viewerPage';
@@ -49,10 +49,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/info-drawer.component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../pages/adf/viewerPage';
@@ -52,10 +52,10 @@ describe('Info Drawer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/viewer-content-services-component.e2e.ts
+2 -4
View File
@@ -17,8 +17,6 @@
import { browser } from 'protractor';
import TestConfig = require('../../test.config');
import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
@@ -81,10 +79,10 @@ describe('Content Services Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../pages/adf/viewerPage';
@@ -47,10 +47,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, 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.login(acsUser.id, acsUser.password);
e2e/core/viewer/viewer-extension.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../pages/adf/viewerPage';
@@ -54,10 +54,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
e2e/core/viewer/viewer-properties.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../../test.config');
import { browser } from 'protractor';
import { LoginPage } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
@@ -55,10 +55,10 @@ describe('Viewer - properties', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
e2e/core/viewer/viewer-share-content.ts
+6 -8
View File
@@ -15,8 +15,6 @@
* limitations under the License.
*/
import TestConfig = require('../../test.config');
import { LoginPage } from '@alfresco/adf-testing';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
@@ -63,10 +61,10 @@ describe('Viewer', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'ECM',
hostEcm: TestConfig.adf.url
hostEcm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser);
site = await this.alfrescoJsApi.core.sitesApi.createSite({
@@ -103,11 +101,11 @@ describe('Viewer', () => {
});
it('[C260105] Should be able to open an image file shared via API', () => {
BrowserActions.getUrl(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
viewerPage.checkImgContainerIsDisplayed();
BrowserActions.getUrl(TestConfig.adf.url);
BrowserActions.getUrl(browser.params.testConfig.adf.url);
navigationBarPage.clickLogoutButton();
BrowserActions.getUrl(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id);
viewerPage.checkImgContainerIsDisplayed();
});
@@ -126,7 +124,7 @@ describe('Viewer', () => {
viewerPage.checkFileIsLoaded();
viewerPage.checkFileNameIsDisplayed(wordFileInfo.name);
await BrowserActions.getUrl(TestConfig.adf.url);
await BrowserActions.getUrl(browser.params.testConfig.adf.url);
navigationBarPage.clickLogoutButton();
await BrowserActions.getUrl(sharedLink);
viewerPage.checkFileIsLoaded();
e2e/insights/analytics-component.e2e.ts
+3 -3
View File
@@ -20,7 +20,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { AnalyticsPage } from '../pages/adf/process-services/analyticsPage';
import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { Tenant } from '../models/APS/tenant';
import { User } from '../models/APS/user';
@@ -39,10 +39,10 @@ describe('Analytics Smoke Test', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
e2e/pages/adf/contentServicesPage.ts
+4 -5
View File
@@ -15,7 +15,6 @@
* limitations under the License.
*/
import TestConfig = require('../../test.config');
import { CreateFolderDialog } from './dialog/createFolderDialog';
import { CreateLibraryDialog } from './dialog/createLibraryDialog';
import { FormControllersPage } from '@alfresco/adf-testing';
@@ -433,16 +432,16 @@ export class ContentServicesPage {
uploadFile(fileLocation) {
this.checkUploadButton();
BrowserVisibility.waitUntilElementIsVisible(this.uploadFileButton);
this.uploadFileButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation)));
this.uploadFileButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, fileLocation)));
this.checkUploadButton();
return this;
}
uploadMultipleFile(files) {
BrowserVisibility.waitUntilElementIsVisible(this.uploadMultipleFileButton);
let allFiles = path.resolve(path.join(TestConfig.main.rootPath, files[0]));
let allFiles = path.resolve(path.join(browser.params.testConfig.main.rootPath, files[0]));
for (let i = 1; i < files.length; i++) {
allFiles = allFiles + '\n' + path.resolve(path.join(TestConfig.main.rootPath, files[i]));
allFiles = allFiles + '\n' + path.resolve(path.join(browser.params.testConfig.main.rootPath, files[i]));
}
this.uploadMultipleFileButton.sendKeys(allFiles);
BrowserVisibility.waitUntilElementIsVisible(this.uploadMultipleFileButton);
@@ -451,7 +450,7 @@ export class ContentServicesPage {
uploadFolder(folder) {
BrowserVisibility.waitUntilElementIsVisible(this.uploadFolderButton);
this.uploadFolderButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, folder)));
this.uploadFolderButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, folder)));
BrowserVisibility.waitUntilElementIsVisible(this.uploadFolderButton);
return this;
}
e2e/pages/adf/navigationBarPage.ts
+3 -4
View File
@@ -18,7 +18,6 @@
import { browser, by, element, ElementFinder } from 'protractor';
import { ProcessServicesPage } from './process-services/processServicesPage';
import { AppListCloudPage } from '@alfresco/adf-testing';
import TestConfig = require('../../test.config');
import { PeopleGroupCloudComponentPage } from './demo-shell/process-services/peopleGroupCloudComponentPage';
import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
@@ -141,7 +140,7 @@ export class NavigationBarPage {
}
openContentServicesFolder(folderId) {
return BrowserActions.getUrl(TestConfig.adf.url + '/files/' + folderId);
return BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + folderId);
}
chooseLanguage(language) {
@@ -208,12 +207,12 @@ export class NavigationBarPage {
}
async openViewer(nodeId) {
await BrowserActions.getUrl(TestConfig.adf.url + `/files(overlay:files/${nodeId}/view`);
await BrowserActions.getUrl(browser.params.testConfig.adf.url + `/files(overlay:files/${nodeId}/view`);
return this;
}
async goToSite(site) {
await BrowserActions.getUrl(TestConfig.adf.url + `/files/${site.entry.guid}/display/list`);
await BrowserActions.getUrl(browser.params.testConfig.adf.url + `/files/${site.entry.guid}/display/list`);
}
async scrollTo(el: ElementFinder) {
e2e/pages/adf/process-services/attachmentListPage.ts
+1 -2
View File
@@ -17,7 +17,6 @@
import { element, by, protractor, browser } from 'protractor';
import TestConfig = require('../../../test.config');
import path = require('path');
import remote = require('selenium-webdriver/remote');
import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
@@ -39,7 +38,7 @@ export class AttachmentListPage {
browser.setFileDetector(new remote.FileDetector());
BrowserVisibility.waitUntilElementIsVisible(this.attachFileButton);
return this.attachFileButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation)));
return this.attachFileButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, fileLocation)));
}
checkFileIsAttached(name) {
e2e/pages/adf/versionManagerPage.ts
+1 -2
View File
@@ -15,7 +15,6 @@
* limitations under the License.
*/
import TestConfig = require('../../test.config');
import path = require('path');
import remote = require('selenium-webdriver/remote');
import { browser, by, element } from 'protractor';
@@ -50,7 +49,7 @@ export class VersionManagePage {
uploadNewVersionFile(fileLocation) {
browser.setFileDetector(new remote.FileDetector());
BrowserVisibility.waitUntilElementIsVisible(this.uploadNewVersionButton);
this.uploadNewVersionButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation)));
this.uploadNewVersionButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, fileLocation)));
BrowserVisibility.waitUntilElementIsVisible(this.showNewVersionButton);
return this;
}
e2e/process-services/apps-section.e2e.ts
+2 -3
View File
@@ -22,7 +22,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -47,10 +46,10 @@ describe('Modify applications', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const user = await users.createTenantAndUser(this.alfrescoJsApi);
e2e/process-services/attach-file-widget.e2e.ts
+6 -6
View File
@@ -23,7 +23,7 @@ import CONSTANTS = require('../util/constants');
import { FileModel } from '../models/ACS/fileModel';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { ViewerPage } from '../pages/adf/viewerPage';
@@ -51,10 +51,10 @@ describe('Start Task - Task App', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -70,10 +70,10 @@ describe('Start Task - Task App', () => {
afterAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
@@ -91,7 +91,7 @@ describe('Start Task - Task App', () => {
.addForm(app.formName)
.clickStartButton();
widget.attachFileWidget().attachFile(appFields.attachFile_id, TestConfig.main.rootPath + pdfFile.location);
widget.attachFileWidget().attachFile(appFields.attachFile_id, browser.params.testConfig.main.rootPath + pdfFile.location);
widget.attachFileWidget().checkFileIsAttached(appFields.attachFile_id, pdfFile.name);
widget.attachFileWidget().viewFile(pdfFile.name);
e2e/process-services/attach-form-component.e2e.ts
+4 -4
View File
@@ -22,7 +22,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -54,13 +54,13 @@ describe('Attach Form Component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
const users = new UsersActions();
const appsActions = new AppsActions();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -82,7 +82,7 @@ describe('Attach Form Component', () => {
afterAll(async (done) => {
try {
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
} catch (error) {
}
e2e/process-services/checklist-component.e2e.ts
+4 -4
View File
@@ -25,7 +25,7 @@ import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -53,16 +53,16 @@ describe('Checklist component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
const pathFile = path.join(TestConfig.main.rootPath + app.file_location);
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
e2e/process-services/comment-component-processes.e2e.ts
+3 -4
View File
@@ -21,7 +21,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/processFilters
import { CommentsPage } from '../pages/adf/commentsPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -41,13 +40,13 @@ describe('Comment component for Processes', () => {
beforeAll(async(done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
const apps = new AppsActions();
const users = new UsersActions();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -69,7 +68,7 @@ describe('Comment component for Processes', () => {
afterAll(async(done) => {
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
e2e/process-services/comment-component-tasks.e2e.ts
+3 -4
View File
@@ -24,7 +24,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -50,13 +49,13 @@ describe('Comment component for Processes', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
const apps = new AppsActions();
const users = new UsersActions();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -78,7 +77,7 @@ describe('Comment component for Processes', () => {
try {
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
} catch (error) {
e2e/process-services/custom-process-filters-sorting.e2e.ts
+3 -4
View File
@@ -22,7 +22,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
import { FiltersPage } from '../pages/adf/process-services/filtersPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -55,7 +54,7 @@ describe('Sorting for process filters', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
done();
@@ -64,7 +63,7 @@ describe('Sorting for process filters', () => {
beforeEach(async (done) => {
const users = new UsersActions();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
tenantId = user.tenantId;
@@ -82,7 +81,7 @@ describe('Sorting for process filters', () => {
afterEach(async (done) => {
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
e2e/process-services/custom-process-filters.e2e.ts
+3 -5
View File
@@ -23,8 +23,6 @@ import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processS
import { AppSettingsToggles } from '../pages/adf/process-services/dialog/appSettingsToggles';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
@@ -54,10 +52,10 @@ describe('New Process Filters', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -71,7 +69,7 @@ describe('New Process Filters', () => {
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
done();
});
e2e/process-services/custom-tasks-filters.e2e.ts
+3 -3
View File
@@ -23,7 +23,7 @@ import moment = require('moment');
import { Tenant } from '../models/APS/tenant';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { Util } from '../util/util';
@@ -80,10 +80,10 @@ describe('Start Task - Custom App', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
e2e/process-services/dynamic-table-date-picker.e2e.ts
+4 -4
View File
@@ -21,7 +21,7 @@ import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processS
import { DatePickerPage } from '../pages/adf/material/datePickerPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -41,13 +41,13 @@ describe('Dynamic Table', () => {
beforeAll(async(done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
apps = new AppsActions();
users = new UsersActions();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -57,7 +57,7 @@ describe('Dynamic Table', () => {
});
afterAll(async(done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
e2e/process-services/empty-process-list-component.e2e.ts
+3 -3
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { LoginPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -50,10 +50,10 @@ describe('Empty Process List Test', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
e2e/process-services/form-component.e2e.ts
+4 -4
View File
@@ -17,7 +17,7 @@
import { LoginPage, Widget, FormPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
@@ -50,12 +50,12 @@ describe('Form Component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
const users = new UsersActions();
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -71,7 +71,7 @@ describe('Form Component', () => {
});
afterAll(async (done) => {
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
e2e/process-services/form-people-widget.e2e.ts
+3 -4
View File
@@ -23,7 +23,6 @@ import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage';
import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -51,10 +50,10 @@ describe('Form widgets - People', () => {
alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(alfrescoJsApi);
@@ -69,7 +68,7 @@ describe('Form widgets - People', () => {
afterAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
e2e/process-services/form-widgets-component.e2e.ts
+8 -8
View File
@@ -23,7 +23,7 @@ import CONSTANTS = require('../util/constants');
import FormDefinitionModel = require('../models/APS/FormDefinitionModel');
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -51,10 +51,10 @@ describe('Form widgets', () => {
alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(alfrescoJsApi);
@@ -83,7 +83,7 @@ describe('Form widgets', () => {
});
afterAll(async (done) => {
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
@@ -206,10 +206,10 @@ describe('Form widgets', () => {
alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(alfrescoJsApi);
@@ -226,7 +226,7 @@ describe('Form widgets', () => {
});
beforeEach(async() => {
const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`;
const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`;
await BrowserActions.getUrl(urlToNavigateTo);
taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS);
taskPage.formFields().checkFormIsDisplayed();
@@ -234,7 +234,7 @@ describe('Form widgets', () => {
afterAll(async (done) => {
await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id);
await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
done();
});
e2e/process-services/pagination-processlist-addingProcesses.e2e.ts
+2 -3
View File
@@ -21,7 +21,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/processFilters
import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -54,10 +53,10 @@ describe('Process List - Pagination when adding processes', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
e2e/process-services/pagination-tasklist-addingTasks.e2e.ts
+2 -3
View File
@@ -26,7 +26,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { AppsActions } from '../actions/APS/apps.actions';
import { UsersActions } from '../actions/users.actions';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { browser } from 'protractor';
@@ -56,10 +55,10 @@ describe('Items per page set to 15 and adding of tasks', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
e2e/process-services/people-component.e2e.ts
+4 -4
View File
@@ -24,7 +24,7 @@ import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -49,10 +49,10 @@ describe('People component', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
@@ -62,7 +62,7 @@ describe('People component', () => {
processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
const pathFile = path.join(TestConfig.main.rootPath + app.file_location);
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
e2e/process-services/process-attachmentList-actionMenu.e2e.ts
+3 -4
View File
@@ -22,7 +22,6 @@ import { AttachmentListPage } from '../pages/adf/process-services/attachmentList
import { ViewerPage } from '../pages/adf/viewerPage';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { Util } from '../util/util';
@@ -64,10 +63,10 @@ describe('Attachment list action menu for processes', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -91,7 +90,7 @@ describe('Attachment list action menu for processes', () => {
afterAll(async (done) => {
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId);
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId);
done();
});
e2e/process-services/process-filters-component.e2e.ts
+3 -4
View File
@@ -15,7 +15,6 @@
* limitations under the License.
*/
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { LoginPage, BrowserActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@@ -63,10 +62,10 @@ describe('Process Filters Test', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -153,7 +152,7 @@ describe('Process Filters Test', () => {
return currentApp.modelId === appModel.id;
});
processFilterUrl = TestConfig.adf.url + '/activiti/apps/' + deployedApp.id + '/processes/';
processFilterUrl = browser.params.testConfig.adf.url + '/activiti/apps/' + deployedApp.id + '/processes/';
return this.alfrescoJsApi.activiti.userFiltersApi.getUserProcessInstanceFilters({appId: deployedApp.id});
});
e2e/process-services/process-instance-details.e2e.ts
+4 -4
View File
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
import { UsersActions } from '../actions/users.actions';
@@ -48,10 +48,10 @@ describe('Process Instance Details', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -76,7 +76,7 @@ describe('Process Instance Details', () => {
afterAll(async (done) => {
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appModel.id);
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(user.tenantId);
e2e/process-services/processList-component.e2e.ts
+5 -5
View File
@@ -18,7 +18,7 @@
import { LoginPage, BrowserActions } from '@alfresco/adf-testing';
import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/processListDemoPage';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -57,10 +57,10 @@ describe('Process List Test', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
user = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -93,7 +93,7 @@ describe('Process List Test', () => {
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appDateModel.id);
await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appUserWidgetModel.id);
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(user.tenantId);
@@ -101,7 +101,7 @@ describe('Process List Test', () => {
});
beforeEach((done) => {
BrowserActions.getUrl(TestConfig.adf.url + '/process-list');
BrowserActions.getUrl(browser.params.testConfig.adf.url + '/process-list');
done();
});
e2e/process-services/processlist-pagination.e2e.ts
+4 -4
View File
@@ -21,7 +21,7 @@ import { PaginationPage } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -63,10 +63,10 @@ describe('Process List - Pagination', function () {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
@@ -95,7 +95,7 @@ describe('Process List - Pagination', function () {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
e2e/process-services/sort-tasklist-pagination.e2e.ts
+3 -3
View File
@@ -22,7 +22,7 @@ import { PaginationPage } from '@alfresco/adf-testing';
import CONSTANTS = require('../util/constants');
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { Util } from '../util/util';
@@ -57,10 +57,10 @@ describe('Task List Pagination - Sorting', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
processUserModel = await users.createTenantAndUser(this.alfrescoJsApi);
e2e/process-services/standalone-task.e2e.ts
+3 -4
View File
@@ -26,7 +26,6 @@ import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant';
import Task = require('../models/APS/Task');
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -49,16 +48,16 @@ describe('Start Task - Task App', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
const pathFile = path.join(TestConfig.main.rootPath + app.file_location);
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);
e2e/process-services/start-process-component.e2e.ts
+3 -4
View File
@@ -16,7 +16,6 @@
*/
import { Util } from '../util/util';
import TestConfig = require('../test.config');
import resources = require('../util/resources');
import CONSTANTS = require('../util/constants');
import { LoginPage } from '@alfresco/adf-testing';
@@ -69,10 +68,10 @@ describe('Start Process Component', () => {
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
@@ -85,7 +84,7 @@ describe('Start Process Component', () => {
this.alfrescoJsApiUserTwo = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApiUserTwo.login(secondProcUserModel.email, secondProcUserModel.password);
e2e/process-services/start-task-custom-app.e2e.ts
+3 -3
View File
@@ -27,7 +27,7 @@ import { Tenant } from '../models/APS/tenant';
import { FileModel } from '../models/ACS/fileModel';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -63,10 +63,10 @@ describe('Start Task - Custom App', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
e2e/process-services/start-task-task-app.e2e.ts
+4 -4
View File
@@ -28,7 +28,7 @@ import CONSTANTS = require('../util/constants');
import { Tenant } from '../models/APS/tenant';
import { FileModel } from '../models/ACS/fileModel';
import TestConfig = require('../test.config');
import { browser } from 'protractor';
import resources = require('../util/resources');
import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
@@ -65,10 +65,10 @@ describe('Start Task - Task App', () => {
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
hostBpm: browser.params.testConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant());
@@ -76,7 +76,7 @@ describe('Start Task - Task App', () => {
processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id);
const pathFile = path.join(TestConfig.main.rootPath + app.file_location);
const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
const file = fs.createReadStream(pathFile);
await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password);

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