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

[ADF-3987]Add clientId values for ACM and BPM in e2e tests. (#4234)

Browse Source 
* Add clientId values for ACM and BPM in e2e tests.

* Fix sorting
This commit is contained in:
cristinaj 2019-02-01 12:13:57 +02:00 committed by Eugenio Romano
parent 2458e30204
commit abb7692476
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/pages/adf/settingsPage.ts
View File

@ -42,6 +42,7 @@ export class SettingsPage {
selectedOption = element(by.css('span[class*="mat-select-value-text"]'));
ecmText = element(by.css('input[data-automation-id*="ecmHost"]'));
bpmText = element(by.css('input[data-automation-id*="bpmHost"]'));
clientIdText = element(by.css('input[id="clientId"]'));
authHostText = element(by.css('input[id="oauthHost"]'));
ssoRadioButton = element(by.cssContainingText('mat-radio-button[id*="mat-radio"]', 'SSO'));
basicAuthRadioButton = element(by.cssContainingText('mat-radio-button[id*="mat-radio"]', 'Basic Authentication'));
@ -144,6 +145,7 @@ export class SettingsPage {
Util.waitUntilElementIsVisible(this.bpmText);
Util.waitUntilElementIsNotOnPage(this.ecmText);
await this.clickSsoRadioButton();
await this.setClientId();
await this.setProcessServicesURL(processServiceURL);
await this.setAuthHost(authHost);
await this.setSilentLogin(silentLogin);
@ -157,6 +159,12 @@ export class SettingsPage {
this.bpmText.sendKeys(processServiceURL);
}
async setClientId () {
Util.waitUntilElementIsVisible(this.clientIdText);
this.clientIdText.clear();
this.clientIdText.sendKeys(TestConfig.adf_aps.clientIdSso);
}
async setContentServicesURL (contentServiceURL) {
Util.waitUntilElementIsClickable(this.ecmText);
this.ecmText.clear();

9
e2e/process-services-cloud/tasks-custom-filters.e2e.ts
View File

@ -128,9 +128,10 @@ describe('Task filters cloud', () => {
tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsDisplayed();
tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed();
tasksCloudDemoPage.taskListCloudComponent().getDataTable().getAllRowsNameColumn().then( (list) => {
let initialList = list.slice(0);
list.sort();
list.sort(function (firstStr, secondStr) {
return firstStr.localeCompare(secondStr);
});
expect(JSON.stringify(initialList) === JSON.stringify(list)).toEqual(true);
});
@ -139,7 +140,9 @@ describe('Task filters cloud', () => {
tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed();
tasksCloudDemoPage.taskListCloudComponent().getDataTable().getAllRowsNameColumn().then( (list) => {
let initialList = list.slice(0);
list.sort();
list.sort(function (firstStr, secondStr) {
return firstStr.localeCompare(secondStr);
});
list.reverse();
expect(JSON.stringify(initialList) === JSON.stringify(list)).toEqual(true);
});

6
e2e/test.config.js
View File

@ -82,6 +82,8 @@ module.exports = {
* @config adf.ACSAPIContextRoot {String}


*/
apiContextRoot: "/alfresco/api/-default-/public",
clientIdSso: "alfresco",
},
adf_aps: {
@ -107,7 +109,9 @@ module.exports = {
* The BPM API context required for calls


* @config adf.APSAPIContextRoot {String}


*/
apiContextRoot: "/activiti-app"
apiContextRoot: "/activiti-app",
clientIdSso: "activiti",
}
};