mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
Fix e2e tests dist issue (#4779)
* Fix e2e tests dist issue * Fix linting * Add await to asyncronous function * fix lintint
This commit is contained in:
committed by
Denys Vuika
parent
7f4e301ec0
commit
894a9599a9
@@ -1,26 +0,0 @@
|
||||
// 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);
|
||||
});
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { browser } from 'protractor';
|
||||
import { LoginSSOPage } from '@alfresco/adf-testing';
|
||||
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { AppListCloudPage } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import resources = require('../util/resources');
|
||||
@@ -25,11 +25,15 @@ describe('Applications list', () => {
|
||||
|
||||
const loginSSOPage = new LoginSSOPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
const appListCloudPage = new AppListCloudPage();
|
||||
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
|
||||
|
||||
beforeAll(async (done) => {
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
@@ -40,5 +44,4 @@ describe('Applications list', () => {
|
||||
appListCloudPage.checkAppIsDisplayed(simpleApp);
|
||||
appListCloudPage.goToApp(simpleApp);
|
||||
});
|
||||
|
||||
});
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { browser } from 'protractor';
|
||||
import { LoginSSOPage } from '@alfresco/adf-testing';
|
||||
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
|
||||
@@ -31,11 +31,15 @@ describe('Edit process filters cloud', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
|
||||
|
||||
beforeAll(async (done) => {
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
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 { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
|
||||
@@ -29,6 +29,7 @@ describe('Edit task filters cloud', () => {
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
let tasksService: TasksService;
|
||||
|
||||
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
|
||||
@@ -43,7 +44,10 @@ describe('Edit task filters cloud', () => {
|
||||
await tasksService.claimTask(assignedTask.entry.id, simpleApp);
|
||||
await tasksService.createAndCompleteTask(completedTaskName, simpleApp);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
|
||||
import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
|
||||
import { GroupCloudComponentPage, PeopleCloudComponentPage, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { browser } from 'protractor';
|
||||
import { LoginSSOPage, IdentityService, GroupIdentityService, RolesService, ApiService } from '@alfresco/adf-testing';
|
||||
import CONSTANTS = require('../util/constants');
|
||||
@@ -34,6 +34,7 @@ xdescribe('People Groups Cloud Component', () => {
|
||||
let identityService: IdentityService;
|
||||
let groupIdentityService: GroupIdentityService;
|
||||
let rolesService: RolesService;
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let apsUser;
|
||||
let activitiUser;
|
||||
@@ -87,7 +88,10 @@ xdescribe('People Groups Cloud Component', () => {
|
||||
users = [`${apsUser.idIdentityService}`, `${activitiUser.idIdentityService}`, `${noRoleUser.idIdentityService}`];
|
||||
groups = [`${groupAps.id}`, `${groupActiviti.id}`, `${groupNoRole.id}`];
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
|
||||
import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
|
||||
import { GroupCloudComponentPage, PeopleCloudComponentPage, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { browser } from 'protractor';
|
||||
import { LoginSSOPage, IdentityService, GroupIdentityService, RolesService, ApiService } from '@alfresco/adf-testing';
|
||||
import CONSTANTS = require('../util/constants');
|
||||
@@ -31,6 +31,7 @@ xdescribe('People Groups Cloud Component', () => {
|
||||
const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage();
|
||||
const peopleCloudComponent = new PeopleCloudComponentPage();
|
||||
const groupCloudComponentPage = new GroupCloudComponentPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
let identityService: IdentityService;
|
||||
let groupIdentityService: GroupIdentityService;
|
||||
let rolesService: RolesService;
|
||||
@@ -87,7 +88,10 @@ xdescribe('People Groups Cloud Component', () => {
|
||||
users = [`${apsUser.idIdentityService}`, `${activitiUser.idIdentityService}`, `${noRoleUser.idIdentityService}`];
|
||||
groups = [`${groupAps.id}`, `${groupActiviti.id}`, `${groupNoRole.id}`];
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import {
|
||||
TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService,
|
||||
LoginSSOPage, ApiService } from '@alfresco/adf-testing';
|
||||
LoginSSOPage, ApiService, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
@@ -33,6 +33,7 @@ xdescribe('Process list cloud', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let tasksService: TasksService;
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
@@ -90,7 +91,10 @@ xdescribe('Process list cloud', () => {
|
||||
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateuserapp);
|
||||
await tasksService.completeTask(claimedTask.entry.id, candidateuserapp);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
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 { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
@@ -32,6 +32,7 @@ xdescribe('Process filters cloud', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let tasksService: TasksService;
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
@@ -60,7 +61,10 @@ xdescribe('Process filters cloud', () => {
|
||||
const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, simpleApp);
|
||||
await tasksService.completeTask(claimedTask.entry.id, simpleApp);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -20,7 +20,7 @@ import CONSTANTS = require('../util/constants');
|
||||
import moment = require('moment');
|
||||
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { ApiService, StringUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService } from '@alfresco/adf-testing';
|
||||
import { ApiService, StringUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { AppListCloudPage } from '@alfresco/adf-testing';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
import { ProcessHeaderCloudPage } from '@alfresco/adf-testing';
|
||||
@@ -43,6 +43,7 @@ describe('Process Header cloud component', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
let processInstancesService: ProcessInstancesService;
|
||||
@@ -75,7 +76,10 @@ describe('Process Header cloud component', () => {
|
||||
childCompleteProcess = parentProcessInstance.list.entries[0];
|
||||
completedCreatedDate = moment(childCompleteProcess.entry.startDate).format(formatDate);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { browser } from 'protractor';
|
||||
import { LoginSSOPage } from '@alfresco/adf-testing';
|
||||
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
|
||||
import { AppListCloudPage } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
@@ -35,6 +35,7 @@ describe('Process list cloud', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
let processInstancesService: ProcessInstancesService;
|
||||
@@ -56,7 +57,10 @@ describe('Process list cloud', () => {
|
||||
processInstances.push(response.entry.id);
|
||||
}
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
|
||||
done();
|
||||
|
@@ -21,7 +21,8 @@ import {
|
||||
ProcessInstancesService,
|
||||
LoginSSOPage,
|
||||
ApiService,
|
||||
LocalStorageUtil
|
||||
LocalStorageUtil,
|
||||
SettingsPage
|
||||
} from '@alfresco/adf-testing';
|
||||
import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
|
||||
import { AppListCloudPage } from '@alfresco/adf-testing';
|
||||
@@ -38,6 +39,7 @@ describe('Process list cloud', () => {
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
let processInstancesService: ProcessInstancesService;
|
||||
@@ -55,7 +57,10 @@ describe('Process list cloud', () => {
|
||||
processInstancesService = new ProcessInstancesService(apiService);
|
||||
runningProcess = await processInstancesService.createProcessInstance(processDefinition.list.entries[0].entry.key, candidateuserapp);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -15,7 +15,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { LoginSSOPage } from '@alfresco/adf-testing';
|
||||
import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { AppListCloudPage, StartProcessCloudPage } from '@alfresco/adf-testing';
|
||||
import { browser } from 'protractor';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
@@ -30,6 +30,8 @@ describe('Start Process', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
const startProcessPage = new StartProcessCloudPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
const processName = StringUtil.generateRandomString(10);
|
||||
const processName255Characters = StringUtil.generateRandomString(255);
|
||||
const processNameBiggerThen255Characters = StringUtil.generateRandomString(256);
|
||||
@@ -37,8 +39,11 @@ describe('Start Process', () => {
|
||||
const requiredError = 'Process Name is required';
|
||||
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
|
||||
|
||||
beforeAll((done) => {
|
||||
browser.get('/');
|
||||
beforeAll(async (done) => {
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
|
||||
navigationBarPage.navigateToProcessServicesCloudPage();
|
||||
|
@@ -20,7 +20,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
import {
|
||||
LoginSSOPage, AppListCloudPage, StringUtil, TaskHeaderCloudPage,
|
||||
StartTasksCloudPage, PeopleCloudComponentPage, TasksService, ApiService, IdentityService, RolesService
|
||||
StartTasksCloudPage, PeopleCloudComponentPage, TasksService, ApiService, IdentityService, RolesService, SettingsPage
|
||||
} from '@alfresco/adf-testing';
|
||||
import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage';
|
||||
import resources = require('../util/resources');
|
||||
@@ -36,6 +36,8 @@ xdescribe('Start Task', () => {
|
||||
const startTask = new StartTasksCloudPage();
|
||||
const peopleCloudComponent = new PeopleCloudComponentPage();
|
||||
const taskDetailsCloudDemoPage = new TaskDetailsCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
const standaloneTaskName = StringUtil.generateRandomString(5);
|
||||
const reassignTaskName = StringUtil.generateRandomString(5);
|
||||
const unassignedTaskName = StringUtil.generateRandomString(5);
|
||||
@@ -64,7 +66,10 @@ xdescribe('Start Task', () => {
|
||||
|
||||
activitiUser = await identityService.createIdentityUser();
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { browser } from 'protractor';
|
||||
import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil } from '@alfresco/adf-testing';
|
||||
import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
import resources = require('../util/resources');
|
||||
@@ -28,6 +28,7 @@ describe('Task filters cloud', () => {
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
let tasksService: TasksService;
|
||||
let apiService: ApiService;
|
||||
|
||||
@@ -38,7 +39,10 @@ describe('Task filters cloud', () => {
|
||||
apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM');
|
||||
await apiService.login(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { browser } from 'protractor';
|
||||
import { AppListCloudPage, StringUtil, ApiService, LoginSSOPage, TasksService, QueryService,
|
||||
ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing';
|
||||
ProcessDefinitionsService, ProcessInstancesService, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage';
|
||||
@@ -31,6 +31,7 @@ xdescribe('Complete task - cloud directive', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const taskDetailsCloudDemoPage = new TaskDetailsCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let tasksService: TasksService;
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
@@ -69,7 +70,10 @@ xdescribe('Complete task - cloud directive', () => {
|
||||
tasksService = new TasksService(apiService);
|
||||
claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateuserapp);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import CONSTANTS = require('../util/constants');
|
||||
import { ApiService, StringUtil } from '@alfresco/adf-testing';
|
||||
import { ApiService, StringUtil, SettingsPage } from '@alfresco/adf-testing';
|
||||
import moment = require('moment');
|
||||
import { browser } from 'protractor';
|
||||
|
||||
@@ -39,6 +39,7 @@ describe('Task Header cloud component', () => {
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const taskDetailsCloudDemoPage = new TaskDetailsCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
let tasksService: TasksService;
|
||||
|
||||
beforeAll(async (done) => {
|
||||
@@ -64,7 +65,10 @@ describe('Task Header cloud component', () => {
|
||||
subTask = await tasksService.getTask(subTaskId.entry.id, simpleApp);
|
||||
subTaskCreatedDate = moment(subTask.entry.createdDate).format(formatDate);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -20,7 +20,7 @@ import {
|
||||
StringUtil, TasksService,
|
||||
ProcessDefinitionsService, ProcessInstancesService,
|
||||
LoginSSOPage, ApiService,
|
||||
AppListCloudPage, LocalStorageUtil, IdentityService, RolesService
|
||||
AppListCloudPage, LocalStorageUtil, IdentityService, RolesService, SettingsPage
|
||||
} from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
@@ -62,6 +62,7 @@ xdescribe('Edit task filters and task list properties', () => {
|
||||
identityService = new IdentityService(apiService);
|
||||
rolesService = new RolesService(apiService);
|
||||
tasksService = new TasksService(apiService);
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
const apsUser = await identityService.createIdentityUser();
|
||||
const apsUserRoleId = await rolesService.getRoleIdByRoleName(CONSTANTS.ROLES.APS_USER);
|
||||
@@ -127,7 +128,10 @@ xdescribe('Edit task filters and task list properties', () => {
|
||||
]
|
||||
}));
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { browser } from 'protractor';
|
||||
|
||||
import { ApiService, LoginSSOPage, TasksService } from '@alfresco/adf-testing';
|
||||
import { ApiService, LoginSSOPage, TasksService, SettingsPage } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
import { AppListCloudPage } from '@alfresco/adf-testing';
|
||||
@@ -31,6 +31,7 @@ describe('Task list cloud - selection', () => {
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
|
||||
let tasksService: TasksService;
|
||||
|
||||
@@ -54,7 +55,10 @@ describe('Task list cloud - selection', () => {
|
||||
tasks.push(response.entry.name);
|
||||
}
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -24,7 +24,8 @@ import {
|
||||
ProcessDefinitionsService,
|
||||
ProcessInstancesService,
|
||||
LoginSSOPage,
|
||||
ApiService
|
||||
ApiService,
|
||||
SettingsPage
|
||||
} from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
@@ -39,6 +40,7 @@ describe('Task filters cloud', () => {
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const tasksCloudDemoPage = new TasksCloudDemoPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
let tasksService: TasksService;
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
let processInstancesService: ProcessInstancesService;
|
||||
@@ -86,7 +88,10 @@ describe('Task filters cloud', () => {
|
||||
await processInstancesService.deleteProcessInstance(secondProcessInstance.entry.id, simpleApp);
|
||||
await queryService.getProcessInstanceTasks(processInstance.entry.id, simpleApp);
|
||||
|
||||
browser.get('/');
|
||||
await settingsPage.setProviderBpmSso(
|
||||
browser.params.config.bpmHost,
|
||||
browser.params.config.oauth2.host,
|
||||
browser.params.config.identityHost);
|
||||
loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password);
|
||||
done();
|
||||
});
|
||||
|
@@ -46,7 +46,6 @@
|
||||
"e2e": "./scripts/test-e2e-lib.sh -host 'localhost:4200' -dev --folder demo-shell",
|
||||
"e2e-lib": "ng e2e lib-e2e-test --port=4200",
|
||||
"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 -----------------------------------------------",
|
||||
"06s": "",
|
||||
"clean": "rimraf dist ./node_modules typings",
|
||||
|
@@ -177,10 +177,6 @@ export NAME_TEST=$NAME_TEST
|
||||
export MAXINSTANCES=$MAXINSTANCES
|
||||
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
|
||||
echo "====== Use the alfresco JS-API '$JSAPI_VERSION'====="
|
||||
npm install alfresco-js-api@${JSAPI_VERSION}
|
||||
|
Reference in New Issue
Block a user