mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
Added a new LocalStorageUtil and using the setConfigMethod to set the local storage variables (#4575)
* added a new LocalStorageUtil and using the setConfigMethod to set the localstorage variables, instead of using hte settings ui page. * linting fix * fixing import paths * update new path LocalStorageUtil * fix problems after rebase * fix async loadin and clear * local storage fix * fix lint * fix cs tests * fix tag navigation and rename file appNavigation to processTabNavigation * fix lint * fix process test * fix lint Signed-off-by: Eugenio Romano <eugenio.romano@alfresco.com> * fix start process cloud * inc timeout
This commit is contained in:
committed by
Eugenio Romano
parent
97ad54a4f8
commit
e85b57876e
@@ -17,13 +17,14 @@
|
||||
|
||||
import TestConfig = require('../test.config');
|
||||
|
||||
import { TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService,
|
||||
LoginSSOPage, ApiService, SettingsPage } 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';
|
||||
import { AppListCloudPage } from '@alfresco/adf-testing';
|
||||
import { ConfigEditorPage } from '../pages/adf/configEditorPage';
|
||||
import { AppListCloudPage, LocalStorageUtil } from '@alfresco/adf-testing';
|
||||
import resources = require('../util/resources');
|
||||
|
||||
import { browser, protractor } from 'protractor';
|
||||
@@ -31,7 +32,6 @@ import { browser, protractor } from 'protractor';
|
||||
describe('Process list cloud', () => {
|
||||
|
||||
describe('Process List', () => {
|
||||
const configEditorPage = new ConfigEditorPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
const loginSSOPage = new LoginSSOPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
@@ -52,32 +52,27 @@ describe('Process list cloud', () => {
|
||||
loginSSOPage.clickOnSSOButton();
|
||||
loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
|
||||
navigationBarPage.clickConfigEditorButton();
|
||||
configEditorPage.clickEditProcessCloudConfiguration();
|
||||
configEditorPage.clickClearButton();
|
||||
configEditorPage.enterBigConfigurationText(`{
|
||||
"filterProperties": [
|
||||
"appName",
|
||||
"status",
|
||||
"processInstanceId",
|
||||
"order",
|
||||
"sort",
|
||||
"order"
|
||||
await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify({
|
||||
'filterProperties': [
|
||||
'appName',
|
||||
'status',
|
||||
'processInstanceId',
|
||||
'order',
|
||||
'sort',
|
||||
'order'
|
||||
],
|
||||
"sortProperties": [
|
||||
"id",
|
||||
"name",
|
||||
"status",
|
||||
"startDate"
|
||||
'sortProperties': [
|
||||
'id',
|
||||
'name',
|
||||
'status',
|
||||
'startDate'
|
||||
],
|
||||
"actions": [
|
||||
"save",
|
||||
"saveAs",
|
||||
"delete"
|
||||
'actions': [
|
||||
'save',
|
||||
'saveAs',
|
||||
'delete'
|
||||
]
|
||||
}`);
|
||||
|
||||
configEditorPage.clickSaveButton();
|
||||
}));
|
||||
|
||||
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
|
||||
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
@@ -101,7 +96,7 @@ describe('Process list cloud', () => {
|
||||
done();
|
||||
});
|
||||
|
||||
beforeEach(async(done) => {
|
||||
beforeEach(async (done) => {
|
||||
navigationBarPage.navigateToProcessServicesCloudPage();
|
||||
appListCloudComponent.checkApsContainer();
|
||||
appListCloudComponent.goToApp(candidateuserapp);
|
||||
|
@@ -21,13 +21,13 @@ import {
|
||||
ProcessInstancesService,
|
||||
LoginSSOPage,
|
||||
ApiService,
|
||||
SettingsPage
|
||||
SettingsPage,
|
||||
LocalStorageUtil
|
||||
} 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';
|
||||
import { ConfigEditorPage } from '../pages/adf/configEditorPage';
|
||||
import { ProcessListCloudConfiguration } from './processListCloud.config';
|
||||
|
||||
import resources = require('../util/resources');
|
||||
@@ -38,7 +38,6 @@ describe('Process list cloud', () => {
|
||||
const settingsPage = new SettingsPage();
|
||||
const loginSSOPage = new LoginSSOPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
const configEditor = new ConfigEditorPage();
|
||||
const appListCloudComponent = new AppListCloudPage();
|
||||
const processCloudDemoPage = new ProcessCloudDemoPage();
|
||||
|
||||
@@ -67,11 +66,8 @@ describe('Process list cloud', () => {
|
||||
beforeEach(async (done) => {
|
||||
const processListCloudConfiguration = new ProcessListCloudConfiguration();
|
||||
jsonFile = processListCloudConfiguration.getConfiguration();
|
||||
done();
|
||||
navigationBarPage.clickConfigEditorButton();
|
||||
configEditor.clickProcessListCloudConfiguration();
|
||||
configEditor.clickClearButton();
|
||||
configEditor.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton();
|
||||
|
||||
await LocalStorageUtil.setConfigField('adf-cloud-process-list', JSON.stringify(jsonFile));
|
||||
|
||||
navigationBarPage.navigateToProcessServicesCloudPage();
|
||||
appListCloudComponent.checkApsContainer();
|
||||
|
@@ -51,6 +51,7 @@ describe('Start Process', () => {
|
||||
|
||||
afterEach((done) => {
|
||||
navigationBarPage.navigateToProcessServicesCloudPage();
|
||||
appListCloudComponent.checkApsContainer();
|
||||
done();
|
||||
});
|
||||
|
||||
|
@@ -20,22 +20,19 @@ import TestConfig = require('../test.config');
|
||||
import { StringUtil, TasksService,
|
||||
ProcessDefinitionsService, ProcessInstancesService,
|
||||
LoginSSOPage, ApiService,
|
||||
SettingsPage, AppListCloudPage } from '@alfresco/adf-testing';
|
||||
SettingsPage, AppListCloudPage, LocalStorageUtil } from '@alfresco/adf-testing';
|
||||
import { NavigationBarPage } from '../pages/adf/navigationBarPage';
|
||||
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
|
||||
import { ConfigEditorPage } from '../pages/adf/configEditorPage';
|
||||
import { TaskListCloudConfiguration } from './taskListCloud.config';
|
||||
|
||||
import moment = require('moment');
|
||||
import { DateUtil } from '../util/dateUtil';
|
||||
|
||||
import { NotificationPage } from '../pages/adf/notificationPage';
|
||||
import resources = require('../util/resources');
|
||||
|
||||
describe('Edit task filters and task list properties', () => {
|
||||
|
||||
describe('Edit task filters and task list properties', () => {
|
||||
const configEditorPage = new ConfigEditorPage();
|
||||
const settingsPage = new SettingsPage();
|
||||
const loginSSOPage = new LoginSSOPage();
|
||||
const navigationBarPage = new NavigationBarPage();
|
||||
@@ -46,7 +43,6 @@ describe('Edit task filters and task list properties', () => {
|
||||
let tasksService: TasksService;
|
||||
let processDefinitionService: ProcessDefinitionsService;
|
||||
let processInstancesService: ProcessInstancesService;
|
||||
const notificationPage = new NotificationPage();
|
||||
|
||||
const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name;
|
||||
const candidateUserApp = resources.ACTIVITI7_APPS.CANDIDATE_USER_APP.name;
|
||||
@@ -66,48 +62,36 @@ describe('Edit task filters and task list properties', () => {
|
||||
loginSSOPage.clickOnSSOButton();
|
||||
loginSSOPage.loginSSOIdentityService(user, password);
|
||||
|
||||
navigationBarPage.clickConfigEditorButton();
|
||||
|
||||
configEditorPage.clickTaskListCloudConfiguration();
|
||||
configEditorPage.clickClearButton();
|
||||
configEditorPage.enterBigConfigurationText(JSON.stringify(jsonFile)).clickSaveButton();
|
||||
notificationPage.checkNotificationSnackBarIsDisplayedWithMessage('Save');
|
||||
notificationPage.checkNotificationSnackBarIsNotDisplayed();
|
||||
|
||||
configEditorPage.clickEditTaskConfiguration();
|
||||
configEditorPage.clickClearButton();
|
||||
|
||||
configEditorPage.enterBigConfigurationText(`{
|
||||
"filterProperties": [
|
||||
"appName",
|
||||
"status",
|
||||
"assignee",
|
||||
"taskName",
|
||||
"parentTaskId",
|
||||
"priority",
|
||||
"standAlone",
|
||||
"owner",
|
||||
"processDefinitionId",
|
||||
"processInstanceId",
|
||||
"lastModified",
|
||||
"sort",
|
||||
"order"
|
||||
],
|
||||
"sortProperties": [
|
||||
"id",
|
||||
"name",
|
||||
"createdDate",
|
||||
"priority",
|
||||
"processDefinitionId"
|
||||
],
|
||||
"actions": [
|
||||
"save",
|
||||
"saveAs",
|
||||
"delete"
|
||||
]
|
||||
}`);
|
||||
|
||||
configEditorPage.clickSaveButton();
|
||||
await LocalStorageUtil.setConfigField('adf-cloud-task-list', JSON.stringify(jsonFile));
|
||||
await LocalStorageUtil.setConfigField('adf-edit-task-filter', JSON.stringify({
|
||||
'filterProperties': [
|
||||
'appName',
|
||||
'status',
|
||||
'assignee',
|
||||
'taskName',
|
||||
'parentTaskId',
|
||||
'priority',
|
||||
'standAlone',
|
||||
'owner',
|
||||
'processDefinitionId',
|
||||
'processInstanceId',
|
||||
'lastModified',
|
||||
'sort',
|
||||
'order'
|
||||
],
|
||||
'sortProperties': [
|
||||
'id',
|
||||
'name',
|
||||
'createdDate',
|
||||
'priority',
|
||||
'processDefinitionId'
|
||||
],
|
||||
'actions': [
|
||||
'save',
|
||||
'saveAs',
|
||||
'delete'
|
||||
]
|
||||
}));
|
||||
|
||||
const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM');
|
||||
await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
|
||||
|
Reference in New Issue
Block a user