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

Remove the dependency with TestConfig (#4752)

Browse Source 
* Remove the dependency with TestConfig

* Change protocol to https

* Trigger the cloud change

* Trigger the cloud change
This commit is contained in:
Maurizio Vitale
2019-05-20 18:11:01 +01:00
committed by Vito
parent cff9bf0930
commit 1141511a07
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/test.config.js
View File

@@ -51,7 +51,7 @@ module.exports = {
*/ */
adminPassword: PASSWORD, adminPassword: PASSWORD,
hostBPM: "http://" + ( HOST_BPM || PROXY || HOST), hostBPM: "https://" + ( HOST_BPM || PROXY || HOST),
clientIdSso: "alfresco", clientIdSso: "alfresco",
@@ -66,7 +66,7 @@ module.exports = {
baseUrl = HOST; baseUrl = HOST;
} }
return `http://${baseUrl}/auth/realms/alfresco`; return `https://${baseUrl}/auth/realms/alfresco`;
}(), }(),
hostIdentity: function () { hostIdentity: function () {
@@ -83,7 +83,7 @@ module.exports = {
} }
return `http://${baseUrl}/auth/admin/realms/alfresco`; return `https://${baseUrl}/auth/admin/realms/alfresco`;
}() }()
}, },

1
lib/process-services-cloud/src/lib/form/services/form-cloud.service.ts
View File

@@ -37,6 +37,7 @@ export class FormCloudService extends BaseCloudService {
private logService: LogService private logService: LogService
) { ) {
super(); super();
this.contextRoot = this.appConfigService.get('bpmHost', ''); this.contextRoot = this.appConfigService.get('bpmHost', '');
} }

8
lib/testing/src/lib/core/actions/identity/tasks.service.ts
View File

@@ -58,9 +58,9 @@ export class TasksService {
} }
async claimTask(taskId, appName, assignee: string = global['TestConfig'].adf.adminEmail) { async claimTask(taskId, appName) {
try { try {
const path = '/' + appName + '/rb/v1/tasks/' + taskId + `/claim?assignee=${assignee}`; const path = '/' + appName + '/rb/v1/tasks/' + taskId + `/claim`;
const method = 'POST'; const method = 'POST';
const queryParams = {}, postBody = {}; const queryParams = {}, postBody = {};
@@ -86,9 +86,9 @@ export class TasksService {
} }
} }
async createAndCompleteTask(taskName, appName, assignee: string = global['TestConfig'].adf.adminEmail) { async createAndCompleteTask(taskName, appName) {
const task = await this.createStandaloneTask(taskName, appName); const task = await this.createStandaloneTask(taskName, appName);
await this.claimTask(task.entry.id, appName, assignee); await this.claimTask(task.entry.id, appName);
await this.completeTask(task.entry.id, appName); await this.completeTask(task.entry.id, appName);
return task; return task;
} }

2
lib/testing/src/lib/core/utils/file-browser.util.ts
View File

@@ -19,7 +19,7 @@ import * as path from 'path';
import * as fs from 'fs'; import * as fs from 'fs';
import { browser } from 'protractor'; import { browser } from 'protractor';
const DEFAULT_ROOT_PATH = global['TestConfig'].main.rootPath; const DEFAULT_ROOT_PATH = global['TestConfig'] ? global['TestConfig'].main.rootPath : __dirname;
export class FileBrowserUtil { export class FileBrowserUtil {

6
scripts/check-env/check-activiti-env.js
View File

@@ -27,10 +27,10 @@ async function main() {
config = { config = {
provider: 'BPM', provider: 'BPM',
hostBpm: `http://${program.host}`, hostBpm: `https://${program.host}`,
authType: 'OAUTH', authType: 'OAUTH',
oauth2: { oauth2: {
host: `http://${program.host}/auth/realms/alfresco`, host: `https://${program.host}/auth/realms/alfresco`,
clientId: program.client, clientId: program.client,
scope: 'openid', scope: 'openid',
secret: '', secret: '',
@@ -433,7 +433,7 @@ async function deleteSiteByName(name) {
let alfrescoJsApi = new alfrescoApi.AlfrescoApiCompatibility({ let alfrescoJsApi = new alfrescoApi.AlfrescoApiCompatibility({
provider: 'ECM', provider: 'ECM',
hostEcm: `http://${program.host}` hostEcm: `https://${program.host}`
}); });
await this.alfrescoJsApi.login(program.username, program.password); await this.alfrescoJsApi.login(program.username, program.password);