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

e2e cloud (#4767)

Browse Source 
* Change strategy with process cloud e2e and fixes

* Change strategy with process cloud e2e and fixes

* Fix path and host

* improve the config and run the replace for cloud

* Use the same name of other scripts

* Fix lint

* Run the replace in case of cloud

* typo

* Export variables if needed
Fix the check env passing the oauth
This commit is contained in:
Maurizio Vitale 2019-05-23 10:24:32 +01:00 committed by Denys Vuika
parent 446efe4297
commit abb76d956b
26 changed files with 301 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@ node_modules
bundles bundles
workspace.xml workspace.xml
.idea/ .idea/
.env.cloud
dist/ dist/
tmp tmp
e2e-output/ e2e-output/

26
appConfigReplace.cloud.js Executable file
View File

@ -0,0 +1,26 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
require('dotenv').config( { path: './e2e/.env.cloud' });
const fs = require('fs');
const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm";
const OAUTH_HOST = process.env.URL_HOST_SSO_ADF || "keycloak";
const IDENTITY_HOST = process.env.URL_HOST_IDENTITY || "identity";
const OAUTH_CLIENDID = process.env.OAUTH_CLIENDID || "activiti";
const AUTH_TYPE = process.env.AUTH_TYPE || "OAUTH";
const PROVIDERS = process.env.PROVIDERS || "BPM";
fs.readFile('./demo-shell/dist/app.config.json', (err, appConfigString) => {
if (err) throw err;
let appConfig = JSON.parse(appConfigString);
appConfig.bpmHost = BPM_HOST;
appConfig.authType = AUTH_TYPE;
appConfig.providers = PROVIDERS;
appConfig.identityHost = IDENTITY_HOST;
appConfig.oauth2.host = OAUTH_HOST;
appConfig.oauth2.clientId = OAUTH_CLIENDID;
let appConfigReplacedJson = JSON.stringify(appConfig);
fs.writeFileSync('./demo-shell/dist/app.config.json', appConfigReplacedJson);
});

7
e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts
View File

@ -31,6 +31,7 @@ export class ProcessCloudDemoPage {
completedProcesses = element(by.css('span[data-automation-id="completed-processes_filter"]')); completedProcesses = element(by.css('span[data-automation-id="completed-processes_filter"]'));
activeFilter = element(by.css("mat-list-item[class*='active'] span")); activeFilter = element(by.css("mat-list-item[class*='active'] span"));
processFilters = element(by.css("mat-expansion-panel[data-automation-id='Process Filters']")); processFilters = element(by.css("mat-expansion-panel[data-automation-id='Process Filters']"));
processFiltersList = element(by.css('adf-cloud-process-filters'));
createButton = element(by.css('button[data-automation-id="create-button"')); createButton = element(by.css('button[data-automation-id="create-button"'));
newProcessButton = element(by.css('button[data-automation-id="btn-start-process"]')); newProcessButton = element(by.css('button[data-automation-id="btn-start-process"]'));
@ -67,6 +68,7 @@ export class ProcessCloudDemoPage {
} }
getActiveFilterName() { getActiveFilterName() {
BrowserVisibility.waitUntilElementIsVisible(this.activeFilter);
return BrowserActions.getText(this.activeFilter); return BrowserActions.getText(this.activeFilter);
} }
@ -86,6 +88,11 @@ export class ProcessCloudDemoPage {
return this; return this;
} }
isProcessFiltersListVisible() {
BrowserVisibility.waitUntilElementIsVisible(this.processFiltersList);
return this;
}
clickOnCreateButton() { clickOnCreateButton() {
BrowserActions.click(this.createButton); BrowserActions.click(this.createButton);
return this; return this;

14
e2e/process-services-cloud/apps-section-cloud.e2e.ts
View File

@ -15,28 +15,30 @@
* limitations under the License. * limitations under the License.
*/ */
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; import { browser } from 'protractor';
import { LoginSSOPage } from '@alfresco/adf-testing';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import TestConfig = require('../test.config');
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import resources = require('../util/resources'); import resources = require('../util/resources');
describe('Applications list', () => { describe('Applications list', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudPage = new AppListCloudPage(); const appListCloudPage = new AppListCloudPage();
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
beforeAll(async (done) => {
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done();
});
it('[C289910] Should the app be displayed on dashboard when is deployed on APS', () => { it('[C289910] Should the app be displayed on dashboard when is deployed on APS', () => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity);
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudPage.checkApsContainer(); appListCloudPage.checkApsContainer();
appListCloudPage.checkAppIsDisplayed(simpleApp); appListCloudPage.checkAppIsDisplayed(simpleApp);
appListCloudPage.goToApp(simpleApp); appListCloudPage.goToApp(simpleApp);
}); });
}); });

23
e2e/process-services-cloud/edit-process-filters-component.e2e.ts
View File

@ -15,9 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { LoginSSOPage } from '@alfresco/adf-testing';
import { ApiService, IdentityService, LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
@ -27,41 +26,31 @@ import resources = require('../util/resources');
describe('Edit process filters cloud', () => { describe('Edit process filters cloud', () => {
describe('Edit process Filters', () => { describe('Edit process Filters', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
const tasksCloudDemoPage = new TasksCloudDemoPage(); const tasksCloudDemoPage = new TasksCloudDemoPage();
const processCloudDemoPage = new ProcessCloudDemoPage(); const processCloudDemoPage = new ProcessCloudDemoPage();
let identityService: IdentityService;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
beforeAll(async (done) => { beforeAll(async (done) => {
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); browser.get('/');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
identityService = new IdentityService(apiService);
const apsUser = await identityService.createActivitiUserWithRole(apiService);
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false);
loginSSOPage.clickOnSSOButton();
loginSSOPage.loginSSOIdentityService(apsUser.username, apsUser.password);
done(); done();
}); });
beforeEach((done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded(); tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded();
processCloudDemoPage.clickOnProcessFilters(); processCloudDemoPage.clickOnProcessFilters();
processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded(); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded();
done();
}); });
afterEach((done) => { afterEach(() => {
processCloudDemoPage.allProcessesFilter().clickProcessFilter(); processCloudDemoPage.allProcessesFilter().clickProcessFilter();
done();
}); });
it('[C291804] Delete Save and Save as actions should be displayed when clicking on custom filter header', () => { it('[C291804] Delete Save and Save as actions should be displayed when clicking on custom filter header', () => {

23
e2e/process-services-cloud/edit-task-filters-component.e2e.ts
View File

@ -15,9 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { AppListCloudPage, StringUtil, ApiService, LoginSSOPage, TasksService } from '@alfresco/adf-testing';
import { AppListCloudPage, StringUtil, ApiService, LoginSSOPage, TasksService, SettingsPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
@ -26,7 +25,6 @@ import resources = require('../util/resources');
describe('Edit task filters cloud', () => { describe('Edit task filters cloud', () => {
describe('Edit Task Filters', () => { describe('Edit Task Filters', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -35,28 +33,25 @@ describe('Edit task filters cloud', () => {
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString(); const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString();
let assignedTask;
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
loginSSOPage.clickOnSSOButton(); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
assignedTask = await tasksService.createStandaloneTask(assignedTaskName, simpleApp); const assignedTask = await tasksService.createStandaloneTask(assignedTaskName, simpleApp);
await tasksService.claimTask(assignedTask.entry.id, simpleApp); await tasksService.claimTask(assignedTask.entry.id, simpleApp);
await tasksService.createAndCompleteTask(completedTaskName, simpleApp); await tasksService.createAndCompleteTask(completedTaskName, simpleApp);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });
beforeEach((done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
done();
}); });
afterEach((done) => { afterEach((done) => {

24
e2e/process-services-cloud/people-group-cloud-component.e2e.ts
View File

@ -15,9 +15,6 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config');
import { SettingsPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
@ -26,10 +23,9 @@ import { LoginSSOPage, IdentityService, GroupIdentityService, RolesService, ApiS
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import resources = require('../util/resources'); import resources = require('../util/resources');
describe('People Groups Cloud Component', () => { xdescribe('People Groups Cloud Component', () => {
describe('People Groups Cloud Component', () => { describe('People Groups Cloud Component', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage(); const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage();
@ -55,9 +51,12 @@ describe('People Groups Cloud Component', () => {
let clientId; let clientId;
beforeAll(async (done) => { beforeAll(async (done) => {
const apiService = new ApiService(
browser.params.config.oauth2.clientId,
browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
);
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
identityService = new IdentityService(apiService); identityService = new IdentityService(apiService);
rolesService = new RolesService(apiService); rolesService = new RolesService(apiService);
groupIdentityService = new GroupIdentityService(apiService); groupIdentityService = new GroupIdentityService(apiService);
@ -87,23 +86,24 @@ describe('People Groups Cloud Component', () => {
await groupIdentityService.addClientRole(groupActiviti.id, clientId, clientActivitiAdminRoleId, CONSTANTS.ROLES.ACTIVITI_ADMIN); await groupIdentityService.addClientRole(groupActiviti.id, clientId, clientActivitiAdminRoleId, CONSTANTS.ROLES.ACTIVITI_ADMIN);
users = [`${apsUser.idIdentityService}`, `${activitiUser.idIdentityService}`, `${noRoleUser.idIdentityService}`]; users = [`${apsUser.idIdentityService}`, `${activitiUser.idIdentityService}`, `${noRoleUser.idIdentityService}`];
groups = [`${groupAps.id}`, `${groupActiviti.id}`, `${groupNoRole.id}`]; groups = [`${groupAps.id}`, `${groupActiviti.id}`, `${groupNoRole.id}`];
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false);
loginSSOPage.clickOnSSOButton(); browser.get('/');
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
navigationBarPage.navigateToPeopleGroupCloudPage();
done(); done();
}); });
afterAll(async () => { afterAll(async (done) => {
for (let i = 0; i < users.length; i++) { for (let i = 0; i < users.length; i++) {
await identityService.deleteIdentityUser(users[i]); await identityService.deleteIdentityUser(users[i]);
} }
for (let i = 0; i < groups.length; i++) { for (let i = 0; i < groups.length; i++) {
await groupIdentityService.deleteIdentityGroup(groups[i]); await groupIdentityService.deleteIdentityGroup(groups[i]);
} }
done();
}); });
beforeEach(() => { beforeEach(() => {
navigationBarPage.navigateToPeopleGroupCloudPage();
peopleGroupCloudComponentPage.checkGroupsCloudComponentTitleIsDisplayed(); peopleGroupCloudComponentPage.checkGroupsCloudComponentTitleIsDisplayed();
peopleGroupCloudComponentPage.checkPeopleCloudComponentTitleIsDisplayed(); peopleGroupCloudComponentPage.checkPeopleCloudComponentTitleIsDisplayed();
}); });

21
e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts
View File

@ -15,9 +15,6 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config');
import { SettingsPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
@ -26,10 +23,9 @@ import { LoginSSOPage, IdentityService, GroupIdentityService, RolesService, ApiS
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import resources = require('../util/resources'); import resources = require('../util/resources');
describe('People Groups Cloud Component', () => { xdescribe('People Groups Cloud Component', () => {
describe('People Groups Cloud Component', () => { describe('People Groups Cloud Component', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage(); const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage();
@ -55,9 +51,12 @@ describe('People Groups Cloud Component', () => {
let clientId; let clientId;
beforeAll(async (done) => { beforeAll(async (done) => {
const apiService = new ApiService(
browser.params.config.oauth2.clientId,
browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
);
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
identityService = new IdentityService(apiService); identityService = new IdentityService(apiService);
rolesService = new RolesService(apiService); rolesService = new RolesService(apiService);
groupIdentityService = new GroupIdentityService(apiService); groupIdentityService = new GroupIdentityService(apiService);
@ -87,10 +86,9 @@ describe('People Groups Cloud Component', () => {
await groupIdentityService.addClientRole(groupActiviti.id, clientId, clientActivitiAdminRoleId, CONSTANTS.ROLES.ACTIVITI_ADMIN ); await groupIdentityService.addClientRole(groupActiviti.id, clientId, clientActivitiAdminRoleId, CONSTANTS.ROLES.ACTIVITI_ADMIN );
users = [`${apsUser.idIdentityService}`, `${activitiUser.idIdentityService}`, `${noRoleUser.idIdentityService}`]; users = [`${apsUser.idIdentityService}`, `${activitiUser.idIdentityService}`, `${noRoleUser.idIdentityService}`];
groups = [`${groupAps.id}`, `${groupActiviti.id}`, `${groupNoRole.id}`]; groups = [`${groupAps.id}`, `${groupActiviti.id}`, `${groupNoRole.id}`];
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false);
loginSSOPage.clickOnSSOButton(); browser.get('/');
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
navigationBarPage.navigateToPeopleGroupCloudPage();
done(); done();
}); });
@ -104,6 +102,7 @@ describe('People Groups Cloud Component', () => {
}); });
beforeEach(() => { beforeEach(() => {
navigationBarPage.navigateToPeopleGroupCloudPage();
peopleGroupCloudComponentPage.checkGroupsCloudComponentTitleIsDisplayed(); peopleGroupCloudComponentPage.checkGroupsCloudComponentTitleIsDisplayed();
peopleGroupCloudComponentPage.checkPeopleCloudComponentTitleIsDisplayed(); peopleGroupCloudComponentPage.checkPeopleCloudComponentTitleIsDisplayed();
}); });

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

@ -15,12 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config');
import { import {
TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService,
LoginSSOPage, ApiService, SettingsPage LoginSSOPage, ApiService } from '@alfresco/adf-testing';
} from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
@ -28,10 +25,9 @@ import { AppListCloudPage, LocalStorageUtil, BrowserActions } from '@alfresco/ad
import resources = require('../util/resources'); import resources = require('../util/resources');
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Process list cloud', () => { xdescribe('Process list cloud', () => {
describe('Process List', () => { describe('Process List', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -47,9 +43,6 @@ describe('Process list cloud', () => {
const candidateuserapp = resources.ACTIVITI7_APPS.CANDIDATE_USER_APP.name; const candidateuserapp = resources.ACTIVITI7_APPS.CANDIDATE_USER_APP.name;
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false);
loginSSOPage.clickOnSSOButton();
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify({ await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify({
'filterProperties': [ 'filterProperties': [
@ -73,8 +66,12 @@ describe('Process list cloud', () => {
] ]
})); }));
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); const apiService = new ApiService(
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); browser.params.config.oauth2.clientId,
browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
);
await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitions(candidateuserapp); const processDefinition = await processDefinitionService.getProcessDefinitions(candidateuserapp);
@ -92,16 +89,18 @@ describe('Process list cloud', () => {
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateuserapp); const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateuserapp);
await tasksService.completeTask(claimedTask.entry.id, candidateuserapp); await tasksService.completeTask(claimedTask.entry.id, candidateuserapp);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });
beforeEach(async (done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(candidateuserapp); appListCloudComponent.goToApp(candidateuserapp);
tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded(); tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded();
processCloudDemoPage.clickOnProcessFilters(); processCloudDemoPage.clickOnProcessFilters();
done();
}); });
xit('[C290069] Should display processes ordered by name when Name is selected from sort dropdown', async () => { xit('[C290069] Should display processes ordered by name when Name is selected from sort dropdown', async () => {

21
e2e/process-services-cloud/process-filters-cloud.e2e.ts
View File

@ -15,9 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, LoginSSOPage, ApiService } from '@alfresco/adf-testing';
import { TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, LoginSSOPage, ApiService, SettingsPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
@ -28,7 +27,6 @@ import resources = require('../util/resources');
describe('Process filters cloud', () => { describe('Process filters cloud', () => {
describe('Process Filters', () => { describe('Process Filters', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -42,15 +40,13 @@ describe('Process filters cloud', () => {
let runningProcess, completedProcess; let runningProcess, completedProcess;
const simpleApp = resources.ACTIVITI7_APPS.CANDIDATE_USER_APP.name; const simpleApp = resources.ACTIVITI7_APPS.CANDIDATE_USER_APP.name;
const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword;
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(
loginSSOPage.clickOnSSOButton(); browser.params.config.oauth2.clientId,
loginSSOPage.loginSSOIdentityService(user, password); browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp); const processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp);
@ -63,6 +59,9 @@ describe('Process filters cloud', () => {
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, simpleApp); const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, simpleApp);
await tasksService.completeTask(claimedTask.entry.id, simpleApp); await tasksService.completeTask(claimedTask.entry.id, simpleApp);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });

33
e2e/process-services-cloud/process-header-cloud.e2e.ts
View File

@ -15,12 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import moment = require('moment'); import moment = require('moment');
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ApiService, StringUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, SettingsPage } from '@alfresco/adf-testing'; import { ApiService, StringUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService } from '@alfresco/adf-testing';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { ProcessHeaderCloudPage } from '@alfresco/adf-testing'; import { ProcessHeaderCloudPage } from '@alfresco/adf-testing';
@ -28,7 +28,7 @@ import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/p
import resources = require('../util/resources'); import resources = require('../util/resources');
xdescribe('Process Header cloud component', () => { describe('Process Header cloud component', () => {
describe('Process Header cloud component', () => { describe('Process Header cloud component', () => {
@ -38,7 +38,6 @@ xdescribe('Process Header cloud component', () => {
const processHeaderCloudPage = new ProcessHeaderCloudPage(); const processHeaderCloudPage = new ProcessHeaderCloudPage();
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -52,12 +51,11 @@ xdescribe('Process Header cloud component', () => {
let runningProcess, runningCreatedDate, parentCompleteProcess, childCompleteProcess, completedCreatedDate; let runningProcess, runningCreatedDate, parentCompleteProcess, childCompleteProcess, completedCreatedDate;
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(
loginSSOPage.clickOnSSOButton(); browser.params.config.oauth2.clientId,
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp); const processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp);
@ -77,17 +75,18 @@ xdescribe('Process Header cloud component', () => {
childCompleteProcess = parentProcessInstance.list.entries[0]; childCompleteProcess = parentProcessInstance.list.entries[0];
completedCreatedDate = moment(childCompleteProcess.entry.startDate).format(formatDate); completedCreatedDate = moment(childCompleteProcess.entry.startDate).format(formatDate);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });
beforeEach(async (done) => { beforeEach(() => {
await navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
done();
}); });
it('[C305010] Should display process details for running process', async () => { it('[C305010] Should display process details for running process', () => {
await appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded(); tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded();
processCloudDemoPage.clickOnProcessFilters(); processCloudDemoPage.clickOnProcessFilters();
@ -108,8 +107,8 @@ xdescribe('Process Header cloud component', () => {
expect(processHeaderCloudPage.getLastModified()).toEqual(runningCreatedDate); expect(processHeaderCloudPage.getLastModified()).toEqual(runningCreatedDate);
}); });
it('[C305008] Should display process details for completed process', async () => { it('[C305008] Should display process details for completed process', () => {
await appListCloudComponent.goToApp(subProcessApp); appListCloudComponent.goToApp(subProcessApp);
tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded(); tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded();
processCloudDemoPage.clickOnProcessFilters(); processCloudDemoPage.clickOnProcessFilters();

27
e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
View File

@ -15,9 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { LoginSSOPage } from '@alfresco/adf-testing'; import { LoginSSOPage } from '@alfresco/adf-testing';
import { SettingsPage } from '@alfresco/adf-testing';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
@ -31,7 +30,6 @@ import resources = require('../util/resources');
describe('Process list cloud', () => { describe('Process list cloud', () => {
describe('Process List - selection', () => { describe('Process List - selection', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -43,31 +41,30 @@ describe('Process list cloud', () => {
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const noOfProcesses = 3; const noOfProcesses = 3;
let response;
const processInstances = []; const processInstances = [];
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
loginSSOPage.clickOnSSOButton(); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp); const processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
for (let i = 0; i < noOfProcesses; i++) { for (let i = 0; i < noOfProcesses; i++) {
response = await processInstancesService.createProcessInstance(processDefinition.list.entries[0].entry.key, simpleApp); const response = await processInstancesService.createProcessInstance(processDefinition.list.entries[0].entry.key, simpleApp);
processInstances.push(response.entry.id); processInstances.push(response.entry.id);
} }
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });
beforeEach(async (done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
expect(processInstances.length).toEqual(noOfProcesses, 'Wrong preconditions');
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
processCloudDemoPage.clickOnProcessFilters(); processCloudDemoPage.clickOnProcessFilters();
@ -75,12 +72,12 @@ describe('Process list cloud', () => {
expect(processCloudDemoPage.getActiveFilterName()).toBe('Running Processes'); expect(processCloudDemoPage.getActiveFilterName()).toBe('Running Processes');
tasksCloudDemoPage.clickSettingsButton().disableDisplayProcessDetails(); tasksCloudDemoPage.clickSettingsButton().disableDisplayProcessDetails();
tasksCloudDemoPage.clickAppButton(); tasksCloudDemoPage.clickAppButton();
done();
}); });
it('[C297469] Should NOT be able to select a process when settings are set to None', () => { it('[C297469] Should NOT be able to select a process when settings are set to None', () => {
tasksCloudDemoPage.clickSettingsButton().selectSelectionMode('None'); tasksCloudDemoPage.clickSettingsButton().selectSelectionMode('None');
tasksCloudDemoPage.clickAppButton(); tasksCloudDemoPage.clickAppButton();
processCloudDemoPage.isProcessFiltersListVisible();
expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes'); expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes');
processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]); processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]);
@ -90,6 +87,7 @@ describe('Process list cloud', () => {
it('[C297468] Should be able to select only one process when settings are set to Single', () => { it('[C297468] Should be able to select only one process when settings are set to Single', () => {
tasksCloudDemoPage.clickSettingsButton().selectSelectionMode('Single'); tasksCloudDemoPage.clickSettingsButton().selectSelectionMode('Single');
tasksCloudDemoPage.clickAppButton(); tasksCloudDemoPage.clickAppButton();
processCloudDemoPage.isProcessFiltersListVisible();
expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes'); expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes');
processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]); processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]);
@ -103,6 +101,7 @@ describe('Process list cloud', () => {
it('[C297470] Should be able to select multiple processes using keyboard', () => { it('[C297470] Should be able to select multiple processes using keyboard', () => {
tasksCloudDemoPage.clickSettingsButton().selectSelectionMode('Multiple'); tasksCloudDemoPage.clickSettingsButton().selectSelectionMode('Multiple');
tasksCloudDemoPage.clickAppButton(); tasksCloudDemoPage.clickAppButton();
processCloudDemoPage.isProcessFiltersListVisible();
expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes'); expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes');
processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]); processCloudDemoPage.processListCloudComponent().selectRowById(processInstances[0]);
@ -117,6 +116,7 @@ describe('Process list cloud', () => {
it('[C297465] Should be able to select multiple processes using checkboxes', () => { it('[C297465] Should be able to select multiple processes using checkboxes', () => {
tasksCloudDemoPage.clickSettingsButton().enableMultiSelection(); tasksCloudDemoPage.clickSettingsButton().enableMultiSelection();
tasksCloudDemoPage.clickAppButton(); tasksCloudDemoPage.clickAppButton();
processCloudDemoPage.isProcessFiltersListVisible();
expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes'); expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes');
processCloudDemoPage.processListCloudComponent().checkCheckboxById(processInstances[0]); processCloudDemoPage.processListCloudComponent().checkCheckboxById(processInstances[0]);
@ -132,6 +132,7 @@ describe('Process list cloud', () => {
it('[C299125] Should be possible to select all the rows when multiselect is true', () => { it('[C299125] Should be possible to select all the rows when multiselect is true', () => {
tasksCloudDemoPage.clickSettingsButton().enableMultiSelection(); tasksCloudDemoPage.clickSettingsButton().enableMultiSelection();
tasksCloudDemoPage.clickAppButton(); tasksCloudDemoPage.clickAppButton();
processCloudDemoPage.isProcessFiltersListVisible();
expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes'); expect(processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes');
processCloudDemoPage.processListCloudComponent().getDataTable().checkAllRowsButtonIsDisplayed().checkAllRows(); processCloudDemoPage.processListCloudComponent().getDataTable().checkAllRowsButtonIsDisplayed().checkAllRows();

15
e2e/process-services-cloud/processList-cloud-component.e2e.ts
View File

@ -15,13 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { import {
ProcessDefinitionsService, ProcessDefinitionsService,
ProcessInstancesService, ProcessInstancesService,
LoginSSOPage, LoginSSOPage,
ApiService, ApiService,
SettingsPage,
LocalStorageUtil LocalStorageUtil
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
@ -35,7 +34,6 @@ import resources = require('../util/resources');
describe('Process list cloud', () => { describe('Process list cloud', () => {
describe('Process List', () => { describe('Process List', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -49,17 +47,16 @@ describe('Process list cloud', () => {
let runningProcess; let runningProcess;
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
loginSSOPage.clickOnSSOButton(); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
processDefinitionService = new ProcessDefinitionsService(apiService); processDefinitionService = new ProcessDefinitionsService(apiService);
const processDefinition = await processDefinitionService.getProcessDefinitions(candidateuserapp); const processDefinition = await processDefinitionService.getProcessDefinitions(candidateuserapp);
processInstancesService = new ProcessInstancesService(apiService); processInstancesService = new ProcessInstancesService(apiService);
runningProcess = await processInstancesService.createProcessInstance(processDefinition.list.entries[0].entry.key, candidateuserapp); runningProcess = await processInstancesService.createProcessInstance(processDefinition.list.entries[0].entry.key, candidateuserapp);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });

12
e2e/process-services-cloud/start-process-cloud.e2e.ts
View File

@ -15,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; import { LoginSSOPage } from '@alfresco/adf-testing';
import { AppListCloudPage, StartProcessCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage, StartProcessCloudPage } from '@alfresco/adf-testing';
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
import { StringUtil } from '@alfresco/adf-testing'; import { StringUtil } from '@alfresco/adf-testing';
@ -25,7 +25,6 @@ import resources = require('../util/resources');
describe('Start Process', () => { describe('Start Process', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -36,13 +35,12 @@ describe('Start Process', () => {
const processNameBiggerThen255Characters = StringUtil.generateRandomString(256); const processNameBiggerThen255Characters = StringUtil.generateRandomString(256);
const lengthValidationError = 'Length exceeded, 255 characters max.'; const lengthValidationError = 'Length exceeded, 255 characters max.';
const requiredError = 'Process Name is required'; const requiredError = 'Process Name is required';
const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
beforeAll((done) => { beforeAll((done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); browser.get('/');
loginSSOPage.clickOnSSOButton(); loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(user, password);
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
done(); done();

38
e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts
View File

@ -15,20 +15,19 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { import {
LoginSSOPage, SettingsPage, AppListCloudPage, StringUtil, TaskHeaderCloudPage, LoginSSOPage, AppListCloudPage, StringUtil, TaskHeaderCloudPage,
StartTasksCloudPage, PeopleCloudComponentPage, TasksService, ApiService, IdentityService, RolesService StartTasksCloudPage, PeopleCloudComponentPage, TasksService, ApiService, IdentityService, RolesService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage'; import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage';
import resources = require('../util/resources'); import resources = require('../util/resources');
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
describe('Start Task', () => { xdescribe('Start Task', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const taskHeaderCloudPage = new TaskHeaderCloudPage(); const taskHeaderCloudPage = new TaskHeaderCloudPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
@ -50,11 +49,11 @@ describe('Start Task', () => {
let activitiUser; let activitiUser;
let identityService: IdentityService; let identityService: IdentityService;
let apiService: ApiService;
beforeAll(async (done) => { beforeAll(async (done) => {
apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
identityService = new IdentityService(apiService); identityService = new IdentityService(apiService);
apsUser = await identityService.createActivitiUserWithRole(apiService); apsUser = await identityService.createActivitiUserWithRole(apiService);
@ -65,16 +64,14 @@ describe('Start Task', () => {
activitiUser = await identityService.createIdentityUser(); activitiUser = await identityService.createIdentityUser();
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); browser.get('/');
loginSSOPage.clickOnSSOButton(); loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(apsUser.username, apsUser.password);
done(); done();
}); });
afterAll(async (done) => { afterAll(async (done) => {
try { try {
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(apsUser.email, apsUser.password);
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const tasksService = new TasksService(apiService); const tasksService = new TasksService(apiService);
const tasks = [standaloneTaskName, unassignedTaskName, reassignTaskName]; const tasks = [standaloneTaskName, unassignedTaskName, reassignTaskName];
@ -91,16 +88,15 @@ describe('Start Task', () => {
done(); done();
}); });
beforeEach(async (done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.checkAppIsDisplayed(simpleApp); appListCloudComponent.checkAppIsDisplayed(simpleApp);
appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitForTableBody(); tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitForTableBody();
done();
}); });
it('[C297675] Should create a task unassigned when assignee field is empty in Start Task form', () => { xit('[C297675] Should create a task unassigned when assignee field is empty in Start Task form', () => {
tasksCloudDemoPage.openNewTaskForm(); tasksCloudDemoPage.openNewTaskForm();
startTask.checkFormIsDisplayed(); startTask.checkFormIsDisplayed();
peopleCloudComponent.clearAssignee(); peopleCloudComponent.clearAssignee();
@ -119,7 +115,7 @@ describe('Start Task', () => {
expect(taskHeaderCloudPage.getAssignee()).toBe('No assignee'); expect(taskHeaderCloudPage.getAssignee()).toBe('No assignee');
}); });
it('[C291956] Should be able to create a new standalone task without assignee', () => { xit('[C291956] Should be able to create a new standalone task without assignee', () => {
tasksCloudDemoPage.openNewTaskForm(); tasksCloudDemoPage.openNewTaskForm();
startTask.checkFormIsDisplayed(); startTask.checkFormIsDisplayed();
expect(peopleCloudComponent.getAssignee()).toContain(apsUser.firstName, 'does not contain Admin'); expect(peopleCloudComponent.getAssignee()).toContain(apsUser.firstName, 'does not contain Admin');
@ -133,7 +129,7 @@ describe('Start Task', () => {
tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(unassignedTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(unassignedTaskName);
}); });
it('[C290166] Should be possible to cancel a task', () => { xit('[C290166] Should be possible to cancel a task', () => {
tasksCloudDemoPage.openNewTaskForm(); tasksCloudDemoPage.openNewTaskForm();
startTask.checkFormIsDisplayed(); startTask.checkFormIsDisplayed();
startTask.checkStartButtonIsDisabled() startTask.checkStartButtonIsDisabled()
@ -170,7 +166,7 @@ describe('Start Task', () => {
.clickCancelButton(); .clickCancelButton();
}); });
it('[C291774] Should be displayed an error message if the date is invalid', () => { xit('[C291774] Should be displayed an error message if the date is invalid', () => {
tasksCloudDemoPage.openNewTaskForm(); tasksCloudDemoPage.openNewTaskForm();
startTask.addDueDate('12/12/2018') startTask.addDueDate('12/12/2018')
.checkStartButtonIsEnabled(); .checkStartButtonIsEnabled();
@ -181,7 +177,7 @@ describe('Start Task', () => {
.clickCancelButton(); .clickCancelButton();
}); });
it('[C290182] Should be possible to assign the task to another user', () => { xit('[C290182] Should be possible to assign the task to another user', () => {
tasksCloudDemoPage.openNewTaskForm(); tasksCloudDemoPage.openNewTaskForm();
startTask.checkFormIsDisplayed(); startTask.checkFormIsDisplayed();
startTask.addName(standaloneTaskName); startTask.addName(standaloneTaskName);
@ -193,14 +189,14 @@ describe('Start Task', () => {
tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(standaloneTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(standaloneTaskName);
}); });
it('[C291953] Assignee field should display the logged user as default', () => { xit('[C291953] Assignee field should display the logged user as default', () => {
tasksCloudDemoPage.openNewTaskForm(); tasksCloudDemoPage.openNewTaskForm();
startTask.checkFormIsDisplayed(); startTask.checkFormIsDisplayed();
expect(peopleCloudComponent.getAssignee()).toContain(apsUser.firstName, 'does not contain Admin'); expect(peopleCloudComponent.getAssignee()).toContain(apsUser.firstName, 'does not contain Admin');
startTask.clickCancelButton(); startTask.clickCancelButton();
}); });
it('[C305050] Should be able to reassign the removed user when starting a new task', () => { xit('[C305050] Should be able to reassign the removed user when starting a new task', () => {
tasksCloudDemoPage.openNewTaskForm(); tasksCloudDemoPage.openNewTaskForm();
startTask.checkFormIsDisplayed(); startTask.checkFormIsDisplayed();
startTask.addName(reassignTaskName); startTask.addName(reassignTaskName);

28
e2e/process-services-cloud/task-filters-cloud.e2e.ts
View File

@ -15,9 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil } from '@alfresco/adf-testing';
import { LoginSSOPage, TasksService, ApiService, SettingsPage, AppListCloudPage, StringUtil } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import resources = require('../util/resources'); import resources = require('../util/resources');
@ -25,28 +24,29 @@ import resources = require('../util/resources');
describe('Task filters cloud', () => { describe('Task filters cloud', () => {
describe('Task Filters', () => { describe('Task Filters', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
const tasksCloudDemoPage = new TasksCloudDemoPage(); const tasksCloudDemoPage = new TasksCloudDemoPage();
let tasksService: TasksService; let tasksService: TasksService;
const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword; let apiService: ApiService;
const newTask = StringUtil.generateRandomString(5), completedTask = StringUtil.generateRandomString(5); const newTask = StringUtil.generateRandomString(5), completedTask = StringUtil.generateRandomString(5);
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
beforeAll(() => { beforeAll(async(done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
loginSSOPage.clickOnSSOButton(); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(user, password);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done();
}); });
beforeEach((done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
done();
}); });
it('[C290011] Should display default filters when an app is deployed', () => { it('[C290011] Should display default filters when an app is deployed', () => {
@ -55,9 +55,6 @@ describe('Task filters cloud', () => {
}); });
it('[C290009] Should display default filters and created task', async () => { it('[C290009] Should display default filters and created task', async () => {
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
const task = await tasksService.createStandaloneTask(newTask, simpleApp); const task = await tasksService.createStandaloneTask(newTask, simpleApp);
@ -74,9 +71,6 @@ describe('Task filters cloud', () => {
}); });
it('[C289955] Should display task in Complete Tasks List when task is completed', async () => { it('[C289955] Should display task in Complete Tasks List when task is completed', async () => {
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
const toBeCompletedTask = await tasksService.createStandaloneTask(completedTask, simpleApp); const toBeCompletedTask = await tasksService.createStandaloneTask(completedTask, simpleApp);

19
e2e/process-services-cloud/task-form-cloud-component.e2e.ts
View File

@ -15,9 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { AppListCloudPage, StringUtil, ApiService, LoginSSOPage, TasksService, QueryService,
import { AppListCloudPage, StringUtil, ApiService, LoginSSOPage, SettingsPage, TasksService, QueryService,
ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing'; ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
@ -27,7 +26,6 @@ import resources = require('../util/resources');
describe('Complete task - cloud directive', () => { describe('Complete task - cloud directive', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -44,12 +42,8 @@ describe('Complete task - cloud directive', () => {
const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString(); const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString();
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers);
loginSSOPage.clickOnSSOButton(); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
createdTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateuserapp); createdTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateuserapp);
@ -75,14 +69,15 @@ describe('Complete task - cloud directive', () => {
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateuserapp); claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateuserapp);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });
beforeEach((done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(candidateuserapp); appListCloudComponent.goToApp(candidateuserapp);
done();
}); });
it('[C307093] Complete button is not displayed when the task is already completed', () => { it('[C307093] Complete button is not displayed when the task is already completed', () => {

32
e2e/process-services-cloud/task-header-cloud.e2e.ts
View File

@ -15,20 +15,18 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config');
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
import { ApiService, StringUtil } from '@alfresco/adf-testing'; import { ApiService, StringUtil } from '@alfresco/adf-testing';
import moment = require('moment'); import moment = require('moment');
import { browser } from 'protractor';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { LoginSSOPage, SettingsPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing'; import { LoginSSOPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage'; import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage';
import resources = require('../util/resources'); import resources = require('../util/resources');
describe('Task Header cloud component', () => { describe('Task Header cloud component', () => {
const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword;
const basicCreatedTaskName = StringUtil.generateRandomString(), completedTaskName = StringUtil.generateRandomString(); const basicCreatedTaskName = StringUtil.generateRandomString(), completedTaskName = StringUtil.generateRandomString();
let basicCreatedTask, basicCreatedDate, completedTask, completedCreatedDate, subTask, subTaskCreatedDate; let basicCreatedTask, basicCreatedDate, completedTask, completedCreatedDate, subTask, subTaskCreatedDate;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
@ -36,7 +34,6 @@ describe('Task Header cloud component', () => {
const taskHeaderCloudPage = new TaskHeaderCloudPage(); const taskHeaderCloudPage = new TaskHeaderCloudPage();
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -45,12 +42,8 @@ describe('Task Header cloud component', () => {
let tasksService: TasksService; let tasksService: TasksService;
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers);
loginSSOPage.clickOnSSOButton(); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
loginSSOPage.loginSSOIdentityService(user, password);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
@ -71,17 +64,18 @@ describe('Task Header cloud component', () => {
subTask = await tasksService.getTask(subTaskId.entry.id, simpleApp); subTask = await tasksService.getTask(subTaskId.entry.id, simpleApp);
subTaskCreatedDate = moment(subTask.entry.createdDate).format(formatDate); subTaskCreatedDate = moment(subTask.entry.createdDate).format(formatDate);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });
beforeEach(async (done) => { beforeEach(() => {
await navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
await appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
done();
}); });
it('[C291943] Should display task details for assigned task', async () => { it('[C291943] Should display task details for assigned task', () => {
tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName);
tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName); tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName);
@ -101,7 +95,7 @@ describe('Task Header cloud component', () => {
.toEqual(basicCreatedTask.entry.parentTaskId === null ? '' : basicCreatedTask.entry.parentTaskId); .toEqual(basicCreatedTask.entry.parentTaskId === null ? '' : basicCreatedTask.entry.parentTaskId);
}); });
it('[C291944] Should display task details for completed task', async () => { it('[C291944] Should display task details for completed task', () => {
tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); tasksCloudDemoPage.completedTasksFilter().clickTaskFilter();
tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(completedTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(completedTaskName);
tasksCloudDemoPage.taskListCloudComponent().selectRow(completedTaskName); tasksCloudDemoPage.taskListCloudComponent().selectRow(completedTaskName);
@ -121,7 +115,7 @@ describe('Task Header cloud component', () => {
.toEqual(completedTask.entry.parentTaskId === null ? '' : completedTask.entry.parentTaskId); .toEqual(completedTask.entry.parentTaskId === null ? '' : completedTask.entry.parentTaskId);
}); });
it('[C291945] Should Parent Name and Parent Id not be empty in task details for sub task', async () => { it('[C291945] Should Parent Name and Parent Id not be empty in task details for sub task', () => {
tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(subTask.entry.name); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(subTask.entry.name);
tasksCloudDemoPage.taskListCloudComponent().selectRow(subTask.entry.name); tasksCloudDemoPage.taskListCloudComponent().selectRow(subTask.entry.name);
@ -141,7 +135,7 @@ describe('Task Header cloud component', () => {
.toEqual(subTask.entry.parentTaskId === null ? '' : subTask.entry.parentTaskId); .toEqual(subTask.entry.parentTaskId === null ? '' : subTask.entry.parentTaskId);
}); });
it('[C307032] Should display the appropriate title for the unclaim option of a Task', async () => { xit('[C307032] Should display the appropriate title for the unclaim option of a Task', () => {
tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName);
tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName); tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName);

78
e2e/process-services-cloud/task-list-properties.e2e.ts
View File

@ -15,13 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { import {
StringUtil, TasksService, StringUtil, TasksService,
ProcessDefinitionsService, ProcessInstancesService, ProcessDefinitionsService, ProcessInstancesService,
LoginSSOPage, ApiService, LoginSSOPage, ApiService,
SettingsPage, AppListCloudPage, LocalStorageUtil, IdentityService, RolesService AppListCloudPage, LocalStorageUtil, IdentityService, RolesService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
@ -33,9 +32,8 @@ import { DateUtil } from '../util/dateUtil';
import resources = require('../util/resources'); import resources = require('../util/resources');
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../util/constants');
describe('Edit task filters and task list properties', () => { xdescribe('Edit task filters and task list properties', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
@ -51,7 +49,6 @@ describe('Edit task filters and task list properties', () => {
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const candidateUserApp = resources.ACTIVITI7_APPS.CANDIDATE_USER_APP.name; const candidateUserApp = resources.ACTIVITI7_APPS.CANDIDATE_USER_APP.name;
const noTasksFoundMessage = 'No Tasks Found'; const noTasksFoundMessage = 'No Tasks Found';
const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword;
let createdTask, notAssigned, notDisplayedTask, processDefinition, processInstance, priorityTask, subTask, otherOwnerTask; let createdTask, notAssigned, notDisplayedTask, processDefinition, processInstance, priorityTask, subTask, otherOwnerTask;
const priority = 30; const priority = 30;
@ -60,10 +57,37 @@ describe('Edit task filters and task list properties', () => {
const afterDate = moment().add(1, 'days').format('DD/MM/YYYY'); const afterDate = moment().add(1, 'days').format('DD/MM/YYYY');
beforeAll(async (done) => { beforeAll(async (done) => {
const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers);
await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
identityService = new IdentityService(apiService);
rolesService = new RolesService(apiService);
tasksService = new TasksService(apiService);
const apsUser = await identityService.createIdentityUser();
const apsUserRoleId = await rolesService.getRoleIdByRoleName(CONSTANTS.ROLES.APS_USER);
await identityService.assignRole(apsUser.idIdentityService, apsUserRoleId, CONSTANTS.ROLES.APS_USER);
await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
otherOwnerTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp);
await tasksService.claimTask(otherOwnerTask.entry.id, simpleApp);
createdTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp);
await tasksService.claimTask(createdTask.entry.id, simpleApp);
notAssigned = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp);
priorityTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, {priority: priority});
await tasksService.claimTask(priorityTask.entry.id, simpleApp);
notDisplayedTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateUserApp);
await tasksService.claimTask(notDisplayedTask.entry.id, candidateUserApp);
processDefinitionService = new ProcessDefinitionsService(apiService);
processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp);
processInstancesService = new ProcessInstancesService(apiService);
processInstance = await processInstancesService.createProcessInstance(processDefinition.list.entries[0].entry.key, simpleApp);
subTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, {'parentTaskId': createdTask.entry.id});
await tasksService.claimTask(subTask.entry.id, simpleApp);
const jsonFile = new TaskListCloudConfiguration().getConfiguration(); const jsonFile = new TaskListCloudConfiguration().getConfiguration();
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false);
loginSSOPage.clickOnSSOButton();
loginSSOPage.loginSSOIdentityService(user, password);
await LocalStorageUtil.setConfigField('adf-cloud-task-list', JSON.stringify(jsonFile)); await LocalStorageUtil.setConfigField('adf-cloud-task-list', JSON.stringify(jsonFile));
await LocalStorageUtil.setConfigField('adf-edit-task-filter', JSON.stringify({ await LocalStorageUtil.setConfigField('adf-edit-task-filter', JSON.stringify({
@ -103,49 +127,19 @@ describe('Edit task filters and task list properties', () => {
] ]
})); }));
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); browser.get('/');
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
identityService = new IdentityService(apiService);
rolesService = new RolesService(apiService);
tasksService = new TasksService(apiService);
const apsUser = await identityService.createIdentityUser();
const apsUserRoleId = await rolesService.getRoleIdByRoleName(CONSTANTS.ROLES.APS_USER);
await identityService.assignRole(apsUser.idIdentityService, apsUserRoleId, CONSTANTS.ROLES.APS_USER);
await apiService.login(apsUser.email, apsUser.password);
otherOwnerTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp);
await tasksService.claimTask(otherOwnerTask.entry.id, simpleApp);
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
createdTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp);
await tasksService.claimTask(createdTask.entry.id, simpleApp);
notAssigned = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp);
priorityTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, {priority: priority});
await tasksService.claimTask(priorityTask.entry.id, simpleApp);
notDisplayedTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateUserApp);
await tasksService.claimTask(notDisplayedTask.entry.id, candidateUserApp);
processDefinitionService = new ProcessDefinitionsService(apiService);
processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp);
processInstancesService = new ProcessInstancesService(apiService);
processInstance = await processInstancesService.createProcessInstance(processDefinition.list.entries[0].entry.key, simpleApp);
subTask = await tasksService.createStandaloneSubtask(createdTask.entry.id, simpleApp, StringUtil.generateRandomString());
await tasksService.claimTask(subTask.entry.id, simpleApp);
done(); done();
}); });
describe('Edit task filters and task list properties - filter properties', () => { describe('Edit task filters and task list properties - filter properties', () => {
beforeEach((done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader();
tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed();
done();
}); });
it('[C292004] Filter by appName', () => { it('[C292004] Filter by appName', () => {

22
e2e/process-services-cloud/task-list-selection.e2e.ts
View File

@ -15,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { ApiService, LoginSSOPage, TasksService, SettingsPage } from '@alfresco/adf-testing'; import { ApiService, LoginSSOPage, TasksService } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { AppListCloudPage } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing';
@ -27,7 +27,6 @@ import resources = require('../util/resources');
describe('Task list cloud - selection', () => { describe('Task list cloud - selection', () => {
describe('Task list cloud - selection', () => { describe('Task list cloud - selection', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -36,18 +35,16 @@ describe('Task list cloud - selection', () => {
let tasksService: TasksService; let tasksService: TasksService;
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword;
const noOfTasks = 3; const noOfTasks = 3;
let response; let response;
const tasks = []; const tasks = [];
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(
loginSSOPage.clickOnSSOButton(); browser.params.config.oauth2.clientId,
loginSSOPage.loginSSOIdentityService(user, password); browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
@ -57,17 +54,18 @@ describe('Task list cloud - selection', () => {
tasks.push(response.entry.name); tasks.push(response.entry.name);
} }
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });
beforeEach(async (done) => { beforeEach(() => {
navigationBarPage.navigateToProcessServicesCloudPage(); navigationBarPage.navigateToProcessServicesCloudPage();
appListCloudComponent.checkApsContainer(); appListCloudComponent.checkApsContainer();
appListCloudComponent.goToApp(simpleApp); appListCloudComponent.goToApp(simpleApp);
tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed();
tasksCloudDemoPage.clickSettingsButton().disableDisplayTaskDetails(); tasksCloudDemoPage.clickSettingsButton().disableDisplayTaskDetails();
tasksCloudDemoPage.clickAppButton(); tasksCloudDemoPage.clickAppButton();
done();
}); });
it('[C291914] Should not be able to select any row when selection mode is set to None', () => { it('[C291914] Should not be able to select any row when selection mode is set to None', () => {

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

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import TestConfig = require('../test.config'); import { browser } from 'protractor';
import { import {
StringUtil, StringUtil,
@ -24,8 +24,7 @@ import {
ProcessDefinitionsService, ProcessDefinitionsService,
ProcessInstancesService, ProcessInstancesService,
LoginSSOPage, LoginSSOPage,
ApiService, ApiService
SettingsPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
@ -36,7 +35,6 @@ import resources = require('../util/resources');
describe('Task filters cloud', () => { describe('Task filters cloud', () => {
describe('Filters', () => { describe('Filters', () => {
const settingsPage = new SettingsPage();
const loginSSOPage = new LoginSSOPage(); const loginSSOPage = new LoginSSOPage();
const navigationBarPage = new NavigationBarPage(); const navigationBarPage = new NavigationBarPage();
const appListCloudComponent = new AppListCloudPage(); const appListCloudComponent = new AppListCloudPage();
@ -50,19 +48,17 @@ describe('Task filters cloud', () => {
completedTaskName = StringUtil.generateRandomString(), completedTaskName = StringUtil.generateRandomString(),
assignedTaskName = StringUtil.generateRandomString(), deletedTaskName = StringUtil.generateRandomString(); assignedTaskName = StringUtil.generateRandomString(), deletedTaskName = StringUtil.generateRandomString();
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
const user = TestConfig.adf.adminEmail, password = TestConfig.adf.adminPassword;
let assignedTask, deletedTask, suspendedTasks; let assignedTask, deletedTask, suspendedTasks;
const orderByNameAndPriority = ['cCreatedTask', 'dCreatedTask', 'eCreatedTask']; const orderByNameAndPriority = ['cCreatedTask', 'dCreatedTask', 'eCreatedTask'];
let priority = 30; let priority = 30;
const nrOfTasks = 3; const nrOfTasks = 3;
beforeAll(async (done) => { beforeAll(async (done) => {
settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false); const apiService = new ApiService(
loginSSOPage.clickOnSSOButton(); browser.params.config.oauth2.clientId,
loginSSOPage.loginSSOIdentityService(user, password); browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
);
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
tasksService = new TasksService(apiService); tasksService = new TasksService(apiService);
await tasksService.createStandaloneTask(createdTaskName, simpleApp); await tasksService.createStandaloneTask(createdTaskName, simpleApp);
@ -89,6 +85,9 @@ describe('Task filters cloud', () => {
await processInstancesService.suspendProcessInstance(processInstance.entry.id, simpleApp); await processInstancesService.suspendProcessInstance(processInstance.entry.id, simpleApp);
await processInstancesService.deleteProcessInstance(secondProcessInstance.entry.id, simpleApp); await processInstancesService.deleteProcessInstance(secondProcessInstance.entry.id, simpleApp);
await queryService.getProcessInstanceTasks(processInstance.entry.id, simpleApp); await queryService.getProcessInstanceTasks(processInstance.entry.id, simpleApp);
browser.get('/');
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
done(); done();
}); });

4
package.json
View File

@ -37,7 +37,7 @@
"start:dist": "ng lint dist && npm run validate-config && npm run server-versions && ng serve dist --prod --host 0.0.0.0 --disable-host-check --proxy-config ./demo-shell/proxy.conf.js --open", "start:dist": "ng lint dist && npm run validate-config && npm run server-versions && ng serve dist --prod --host 0.0.0.0 --disable-host-check --proxy-config ./demo-shell/proxy.conf.js --open",
"build": "npm run validate-config && npm run server-versions && ng build dist", "build": "npm run validate-config && npm run server-versions && ng build dist",
"build:dev": "npm run validate-config && npm run style:dev && npm run server-versions && ng build dev", "build:dev": "npm run validate-config && npm run style:dev && npm run server-versions && ng build dev",
"build:dist": "npm run validate-config && npm run server-versions && node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng build dist --prod --stats-json ", "build:dist": "npm run validate-config && npm run server-versions && node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng build dist --prod ",
"style:dev": "npm run webpack -- --config ./lib/config/webpack.style.js --progress --profile --bail", "style:dev": "npm run webpack -- --config ./lib/config/webpack.style.js --progress --profile --bail",
"test": "npm run validate-config && ng test dev --watch=false", "test": "npm run validate-config && ng test dev --watch=false",
"server-versions": "rimraf ./demo-shell/src/versions.json && npm list --depth=0 --json=true --prod=true > ./demo-shell/src/versions.json || exit 0", "server-versions": "rimraf ./demo-shell/src/versions.json && npm list --depth=0 --json=true --prod=true > ./demo-shell/src/versions.json || exit 0",
@ -46,6 +46,7 @@
"e2e": "./scripts/test-e2e-lib.sh -host 'localhost:4200' -dev --folder demo-shell", "e2e": "./scripts/test-e2e-lib.sh -host 'localhost:4200' -dev --folder demo-shell",
"e2e-lib": "ng e2e lib-e2e-test --port=4200", "e2e-lib": "ng e2e lib-e2e-test --port=4200",
"lite-server-e2e": "lite-server --baseDir='demo-shell/dist/' -c ./e2e/lite-server-proxy.js", "lite-server-e2e": "lite-server --baseDir='demo-shell/dist/' -c ./e2e/lite-server-proxy.js",
"replace-cloud-config": "node appConfigReplace.cloud.js",
"06": "echo -------------------------------------------- Clean -----------------------------------------------", "06": "echo -------------------------------------------- Clean -----------------------------------------------",
"06s": "", "06s": "",
"clean": "rimraf dist ./node_modules typings", "clean": "rimraf dist ./node_modules typings",
@ -129,6 +130,7 @@
"bundlesize": "^0.15.3", "bundlesize": "^0.15.3",
"chalk": "^2.3.2", "chalk": "^2.3.2",
"codelyzer": "5.0.0", "codelyzer": "5.0.0",
"dotenv": "6.2.0",
"commander": "^2.15.1", "commander": "^2.15.1",
"concurrently": "^3.5.1", "concurrently": "^3.5.1",
"cspell": "^3.1.3", "cspell": "^3.1.3",

39
protractor.conf.js
View File

@ -11,6 +11,7 @@ let argv = require('yargs').argv;
const fs = require('fs'); const fs = require('fs');
const rimraf = require('rimraf'); const rimraf = require('rimraf');
require('dotenv').config( { path: './e2e/.env.cloud' });
const projectRoot = path.resolve(__dirname); const projectRoot = path.resolve(__dirname);
@ -27,6 +28,32 @@ let MAXINSTANCES = process.env.MAXINSTANCES || 1;
let TIMEOUT = parseInt(process.env.TIMEOUT, 10); let TIMEOUT = parseInt(process.env.TIMEOUT, 10);
let SAVE_SCREENSHOT = (process.env.SAVE_SCREENSHOT == 'true'); let SAVE_SCREENSHOT = (process.env.SAVE_SCREENSHOT == 'true');
const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm";
const OAUTH_HOST = process.env.URL_HOST_SSO_ADF || "keycloak";
const OAUTH_CLIENDID = process.env.OAUTH_CLIENDID || "activiti";
const IDENTITY_HOST = process.env.URL_HOST_IDENTITY || "identity";
const IDENTITY_ADMIN_EMAIL = process.env.IDENTITY_ADMIN_EMAIL || "defaultadmin";
const IDENTITY_ADMIN_PASSWORD = process.env.IDENTITY_ADMIN_PASSWORD || "defaultadminpassword";
const USERNAME_ADF = process.env.USERNAME_ADF || process.env.IDENTITY_USERNAME_ADF || "defaultuser";
const PASSWORD_ADF = process.env.PASSWORD_ADF || process.env.IDENTITY_PASSWORD_ADF || "defaultuserpassword";
const appConfig = {
"bpmHost": BPM_HOST,
"identityHost": IDENTITY_HOST,
"providers": "BPM",
"authType": "OAUTH",
"oauth2": {
"host": OAUTH_HOST,
"clientId": OAUTH_CLIENDID,
"scope": "openid",
"secret": "",
"implicitFlow": true,
"silentLogin": true,
"redirectUri": "/",
"redirectUriLogout": "/logout"
}
};
let specsToRun = './**/e2e/' + FOLDER + '**/*.e2e.ts'; let specsToRun = './**/e2e/' + FOLDER + '**/*.e2e.ts';
if (process.env.NAME_TEST) { if (process.env.NAME_TEST) {
@ -178,10 +205,14 @@ exports.config = {
baseUrl: HOST, baseUrl: HOST,
params: { params: {
config: { config: appConfig,
oauth2: { identityAdmin: {
clientId: 'activiti' email: IDENTITY_ADMIN_EMAIL,
} password: IDENTITY_ADMIN_PASSWORD
},
identityUser: {
email: USERNAME_ADF,
password: PASSWORD_ADF
} }
}, },

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

@ -20,6 +20,7 @@ async function main() {
program program
.version('0.1.0') .version('0.1.0')
.option('--host [type]', 'Remote environment host adf.lab.com ') .option('--host [type]', 'Remote environment host adf.lab.com ')
.option('--oauth [type]', 'oauth host')
.option('--client [type]', 'clientId ') .option('--client [type]', 'clientId ')
.option('-p, --password [type]', 'password ') .option('-p, --password [type]', 'password ')
.option('-u, --username [type]', 'username ') .option('-u, --username [type]', 'username ')
@ -27,10 +28,10 @@ async function main() {
config = { config = {
provider: 'BPM', provider: 'BPM',
hostBpm: `https://${program.host}`, hostBpm: `${program.host}`,
authType: 'OAUTH', authType: 'OAUTH',
oauth2: { oauth2: {
host: `https://${program.host}/auth/realms/alfresco`, host: `${program.oauth}`,
clientId: program.client, clientId: program.client,
scope: 'openid', scope: 'openid',
secret: '', secret: '',

21
scripts/test-e2e-lib.sh
View File

@ -39,27 +39,34 @@ show_help() {
set_username(){ set_username(){
USERNAME=$1 USERNAME=$1
export USERNAME_ADF=$USERNAME
} }
set_password(){ set_password(){
PASSWORD=$1 PASSWORD=$1
export PASSWORD_ADF=$PASSWORD
} }
set_email(){ set_email(){
EMAIL=$1 EMAIL=$1
export EMAIL_ADF=$EMAIL
} }
set_host(){ set_host(){
HOST=$1 HOST=$1
export URL_HOST_ADF=$HOST
} }
set_host_bpm(){ set_host_bpm(){
HOST_BPM=$1 HOST_BPM=$1
export URL_HOST_BPM_ADF=$HOST_BPM
} }
set_host_sso(){ set_host_sso(){
HOST_SSO=$1 HOST_SSO=$1
export URL_HOST_SSO_ADF=$HOST_SSO
} }
set_host_identity(){ set_host_identity(){
HOST_IDENTITY=$1 HOST_IDENTITY=$1
export URL_HOST_IDENTITY=$HOST_IDENTITY
} }
set_test(){ set_test(){
@ -70,10 +77,12 @@ set_test(){
set_browser(){ set_browser(){
echo "====== BROWSER RUN =====" echo "====== BROWSER RUN ====="
BROWSER_RUN=true BROWSER_RUN=true
export BROWSER_RUN=$BROWSER_RUN
} }
set_proxy(){ set_proxy(){
PROXY=$1 PROXY=$1
export PROXY_HOST_ADF=$PROXY
} }
set_timeout(){ set_timeout(){
@ -160,15 +169,6 @@ done
rm -rf ./e2e/downloads/ rm -rf ./e2e/downloads/
rm -rf ./e2e-output/screenshots/ rm -rf ./e2e-output/screenshots/
export URL_HOST_BPM_ADF=$HOST_BPM
export URL_HOST_SSO_ADF=$HOST_SSO
export URL_HOST_IDENTITY=$HOST_IDENTITY
export URL_HOST_ADF=$HOST
export USERNAME_ADF=$USERNAME
export PASSWORD_ADF=$PASSWORD
export EMAIL_ADF=$EMAIL
export BROWSER_RUN=$BROWSER_RUN
export PROXY_HOST_ADF=$PROXY
export SAVE_SCREENSHOT=$SAVE_SCREENSHOT export SAVE_SCREENSHOT=$SAVE_SCREENSHOT
export TIMEOUT=$TIMEOUT export TIMEOUT=$TIMEOUT
export FOLDER=$FOLDER'/' export FOLDER=$FOLDER'/'
@ -177,6 +177,9 @@ export NAME_TEST=$NAME_TEST
export MAXINSTANCES=$MAXINSTANCES export MAXINSTANCES=$MAXINSTANCES
export SELENIUM_PROMISE_MANAGER=$SELENIUM_PROMISE_MANAGER export SELENIUM_PROMISE_MANAGER=$SELENIUM_PROMISE_MANAGER
if [[ $FOLDER == "process-services-cloud/" ]]; then
npm run replace-cloud-config;
fi
if $EXEC_VERSION_JSAPI == true; then if $EXEC_VERSION_JSAPI == true; then
echo "====== Use the alfresco JS-API '$JSAPI_VERSION'=====" echo "====== Use the alfresco JS-API '$JSAPI_VERSION'====="

4
scripts/travis/e2e/process-services-cloud-e2e.sh
View File

@ -8,6 +8,6 @@ AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e")";
AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)";
if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]];
then then
node ./scripts/check-env/check-activiti-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" --client 'activiti' || exit 1; node ./scripts/check-env/check-activiti-env.js --host "$E2E_HOST_BPM" --oauth "$E2E_HOST_SSO" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" --client 'activiti' || exit 1;
./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -host_sso "$E2E_HOST_IDENTITY" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" --folder process-services-cloud --skip-lint --use-dist -b -save || exit 1; ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST_BPM" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" --folder process-services-cloud --skip-lint --use-dist -b -save || exit 1;
fi; fi;