Remove demo shell test and make cloud a bit more stable (#6781)

* remove demo shell test and make cloud a bit more stable

* fix lint

* Update restore-content-directive.e2e.ts

* Update restore-content-directive.e2e.ts

* Update restore-content-directive.e2e.ts

* try fix attach

* Update .travis.yml

* sleep...

* remove about e2e demo shell....

* fix

* lint fix

* configure

* refactor buuild

* names and remove demo shell build from libs

* fix new build approach

* fix

* fix

* .

* uncomment

* .

* .

* fix

* fix

* .

* fix

* lock update

* fix demo shell errors

* use replay subject

* fix some console log error

* suffix problem

* split process e2e

* not need to check everywhere the pagination e2e

* split content

* fix

* fix

* fix

* fix

* reorg

# Conflicts:
#	.travis.yml
This commit is contained in:
Eugenio Romano
2021-03-17 15:17:46 +00:00
committed by GitHub
parent 90aabe3541
commit cd915b307b
115 changed files with 659 additions and 1117 deletions

View File

@@ -21,7 +21,6 @@ env:
#E2E VARIABLES #E2E VARIABLES
- SAVE_SCREENSHOT=true - SAVE_SCREENSHOT=true
- REDIRECT_URI=/ - REDIRECT_URI=/
- REDIRECT_URI_LOGOUT=/logout/
- BROWSER_RUN=true - BROWSER_RUN=true
- MAXINSTANCES=2 - MAXINSTANCES=2
@@ -35,19 +34,19 @@ branches:
stages: stages:
- name: Setup - name: Setup
- name: "Lint & Build Dist & Release" - name: "Build lib"
if: tag IS blank if: tag IS blank
- name: Trigger Alpha ADF child build - name: "Check bundle"
if: (branch = develop AND type = push) OR type = api
- name: Check bundle
if: type = push AND tag IS blank if: type = push AND tag IS blank
- name: Unit test - name: "Trigger Alpha ADF child build"
if: (branch != master AND type != cron AND tag IS blank) OR type = api if: (branch = develop AND type = push) OR type = api
- name: e2e Test - name: "Trigger Beta ADF child build"
if: (branch != master AND type != cron AND tag IS blank) OR type = api
- name: Trigger Beta ADF child build
if: tag =~ .*beta.* if: tag =~ .*beta.*
- name: Release tag - name: "Build"
if: (branch != master AND type != cron AND tag IS blank) OR type = api
- name: "e2e Test"
if: (branch != master AND type != cron AND tag IS blank) OR type = api
- name: "Release tag"
if: type = cron OR branch = master if: type = cron OR branch = master
addons: addons:
@@ -71,67 +70,80 @@ jobs:
use: node_modules_cache use: node_modules_cache
# Run Only for any PR # Run Only for any PR
- stage: "Lint & Build Dist & Release" - stage: "Build lib"
name: Build name: "Lib::Build"
script: script:
- ./scripts/travis/build/build.sh - ./scripts/travis/build/build-libs.sh
- ./scripts/travis/release/release-npm.sh - ./scripts/travis/release/release-npm.sh
- ./scripts/travis/release/release-docker.sh
workspaces: workspaces:
create: create:
name: built_artefacts_cache name: built_libs_cache
paths: paths:
- "$DEMO_SHELL_DIR"
- "$BUILT_LIBS_DIR" - "$BUILT_LIBS_DIR"
use: node_modules_cache use: node_modules_cache
- stage: "Lint & Build Dist & Release" - stage: "Build lib"
name: "Lint" name: "Lint"
script: ./scripts/lint.sh script: ./scripts/lint.sh
workspaces: workspaces:
use: node_modules_cache use: node_modules_cache
- stage: Unit test - stage: "Build"
name: Unit test content name: "Demo Shell :Build && dockerize"
script:
# Build Demo shell for production docker"
- NODE_OPTIONS=--max_old_space_size=8192 nx build demoshell --prod
- ./scripts/travis/release/release-docker.sh
workspaces:
create:
name: built_demo_shell_cache
paths:
- "$DEMO_SHELL_DIR"
use:
- node_modules_cache
- built_libs_cache
- stage: "Build"
name: "content::unit"
script: ./scripts/travis/unit-test/content.sh script: ./scripts/travis/unit-test/content.sh
workspaces: workspaces:
use: node_modules_cache use: node_modules_cache
- stage: Unit test - stage: "Build"
name: Unit test core extension demo name: "core-extension::unit"
script: ./scripts/travis/unit-test/core-extension.sh script: ./scripts/travis/unit-test/core-extension.sh
workspaces: workspaces:
use: node_modules_cache use: node_modules_cache
- stage: Unit test - stage: "Build"
name: Unit test process insights name: "process-insights::unit"
script: ./scripts/travis/unit-test/process.sh script: ./scripts/travis/unit-test/process.sh
workspaces: workspaces:
use: node_modules_cache use: node_modules_cache
- stage: Unit test - stage: "Build"
name: Unit test process-cloud name: "process-cloud::unit"
script: ./scripts/travis/unit-test/process-cloud.sh script: ./scripts/travis/unit-test/process-cloud.sh
workspaces: workspaces:
use: node_modules_cache use: node_modules_cache
- stage: Trigger Alpha ADF child build - stage: "Trigger Alpha ADF child build"
name: Trigger Alpha ADF child build name: "Trigger Alpha ADF child build"
script: ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GITHUB_TOKEN -v alpha script: ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GITHUB_TOKEN -v alpha
workspaces: workspaces:
use: node_modules_cache use: node_modules_cache
- stage: Trigger Beta ADF child build - stage: "Trigger Beta ADF child build"
name: Trigger Beta ADF child build name: "Trigger Beta ADF child build"
script: ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GITHUB_TOKEN -v beta script: ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GITHUB_TOKEN -v beta
workspaces: workspaces:
use: node_modules_cache use: node_modules_cache
- stage: Release tag - stage: "Release tag"
script: ./scripts/travis/release/git-tag.sh script: ./scripts/travis/release/git-tag.sh
- stage: e2e Test - stage: "e2e Test"
name: core name: "Core"
before_script: before_script:
- ./scripts/ci/job_hooks/before_e2e.sh - ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1 - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
@@ -141,10 +153,12 @@ jobs:
workspaces: workspaces:
use: use:
- node_modules_cache - node_modules_cache
- built_artefacts_cache - built_libs_cache
- built_demo_shell_cache
- stage: e2e Test
name: content - stage: "e2e Test"
name: "Content: Components"
before_script: before_script:
- ./scripts/ci/job_hooks/before_e2e.sh - ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1 - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
@@ -153,10 +167,73 @@ jobs:
workspaces: workspaces:
use: use:
- node_modules_cache - node_modules_cache
- built_artefacts_cache - built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="content-services/components"
- stage: e2e Test - stage: "e2e Test"
name: search name: "Content: Directives"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/content-services-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="content-services/directives"
- stage: "e2e Test"
name: "Content: Document List"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/content-services-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="content-services/document-list"
- stage: "e2e Test"
name: "Content: Metadata"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/content-services-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="content-services/metadata"
- stage: "e2e Test"
name: "Content: Upload and Versioning"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/content-services-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="content-services/upload"
- stage: "e2e Test"
name: "Search"
before_script: before_script:
- ./scripts/ci/job_hooks/before_e2e.sh - ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1 - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
@@ -165,10 +242,11 @@ jobs:
workspaces: workspaces:
use: use:
- node_modules_cache - node_modules_cache
- built_artefacts_cache - built_libs_cache
- built_demo_shell_cache
- stage: e2e Test - stage: "e2e Test"
name: process name: "Process: Form"
before_script: before_script:
- ./scripts/ci/job_hooks/before_e2e.sh || travis_terminate 1 - ./scripts/ci/job_hooks/before_e2e.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-env.sh || travis_terminate 1 - ./scripts/ci/check-env/check-ps-env.sh || travis_terminate 1
@@ -178,10 +256,61 @@ jobs:
workspaces: workspaces:
use: use:
- node_modules_cache - node_modules_cache
- built_artefacts_cache - built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services/form"
- stage: e2e Test - stage: "e2e Test"
name: process Cloud name: "Process: Process"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-env.sh || travis_terminate 1
- ./scripts/ci/check-env/check-external-cs-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/process-services-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services/process"
- stage: "e2e Test"
name: "Process: Tasks"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-env.sh || travis_terminate 1
- ./scripts/ci/check-env/check-external-cs-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/process-services-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services/tasks"
- stage: "e2e Test"
name: "Process: Widgets"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-env.sh || travis_terminate 1
- ./scripts/ci/check-env/check-external-cs-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/process-services-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services/widgets"
- stage: "e2e Test"
name: "Process Cloud : Form"
before_script: before_script:
- ./scripts/ci/job_hooks/before_e2e.sh - ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1 - ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
@@ -191,7 +320,78 @@ jobs:
workspaces: workspaces:
use: use:
- node_modules_cache - node_modules_cache
- built_artefacts_cache - built_libs_cache
- smartrunner-cache-process-cloud
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services-cloud/form-field"
- stage: "e2e Test"
name: "Process Cloud : People"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-cloud-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/process-services-cloud-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- smartrunner-cache-process-cloud
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services-cloud/people"
- stage: "e2e Test"
name: "Process Cloud : Process"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-cloud-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/process-services-cloud-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- smartrunner-cache-process-cloud
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services-cloud/process"
- stage: "e2e Test"
name: "Process Cloud : Start Task"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-cloud-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/process-services-cloud-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- smartrunner-cache-process-cloud
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services-cloud/start-task"
- stage: "e2e Test"
name: "Process Cloud : Tasks List"
before_script:
- ./scripts/ci/job_hooks/before_e2e.sh
- ./scripts/ci/check-env/check-cs-env.sh || travis_terminate 1
- ./scripts/ci/check-env/check-ps-cloud-env.sh || travis_terminate 1
script: ./scripts/travis/e2e/process-services-cloud-e2e.sh
after_script: ./scripts/ci/job_hooks/after_e2e.sh
workspaces:
use:
- node_modules_cache
- built_libs_cache
- built_demo_shell_cache
env:
- CONTEXT_ENV="process-services-cloud/task-list"
- stage: Check bundle - stage: Check bundle
script: script:

View File

@@ -162,6 +162,16 @@
"maximumWarning": "6kb" "maximumWarning": "6kb"
} }
], ],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": true,
"buildOptimizer": true,
"verbose": false,
"fileReplacements": [ "fileReplacements": [
{ {
"replace": "demo-shell/src/environments/environment.ts", "replace": "demo-shell/src/environments/environment.ts",

View File

@@ -14,7 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import { AppConfigService, NotificationService, NotificationModel, AlfrescoApiService, IdentityUserService } from '@alfresco/adf-core'; import {
AuthenticationService,
AppConfigService,
NotificationService,
NotificationModel,
AlfrescoApiService,
IdentityUserService
} from '@alfresco/adf-core';
import { NotificationCloudService } from '@alfresco/adf-process-services-cloud'; import { NotificationCloudService } from '@alfresco/adf-process-services-cloud';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +46,7 @@ export class AppNotificationsService {
constructor( constructor(
private appConfigService: AppConfigService, private appConfigService: AppConfigService,
private authenticationService: AuthenticationService,
private notificationCloudService: NotificationCloudService, private notificationCloudService: NotificationCloudService,
private notificationService: NotificationService, private notificationService: NotificationService,
private translateService: TranslateService, private translateService: TranslateService,
@@ -46,6 +54,9 @@ export class AppNotificationsService {
private alfrescoApiService: AlfrescoApiService private alfrescoApiService: AlfrescoApiService
) { ) {
this.alfrescoApiService.alfrescoApiInitialized.subscribe(() => { this.alfrescoApiService.alfrescoApiInitialized.subscribe(() => {
if (this.isProcessServicesEnabled()) {
this.alfrescoApiService.getInstance().oauth2Auth.once('token_issued', () => {
const deployedApps = this.appConfigService.get('alfresco-deployed-apps', []); const deployedApps = this.appConfigService.get('alfresco-deployed-apps', []);
if (deployedApps?.length) { if (deployedApps?.length) {
deployedApps.forEach((app) => { deployedApps.forEach((app) => {
@@ -57,14 +68,26 @@ export class AppNotificationsService {
}); });
}); });
} }
}); });
}
});
}
private isProcessServicesEnabled() {
return this.authenticationService.isLoggedIn() && (this.authenticationService.isBPMProvider() || this.authenticationService.isALLProvider());
} }
notifyEvent(engineEvent) { notifyEvent(engineEvent) {
let message; let message;
switch (engineEvent.eventType) { switch (engineEvent.eventType) {
case 'TASK_ASSIGNED': case 'TASK_ASSIGNED':
message = this.translateService.instant('NOTIFICATIONS.TASK_ASSIGNED', { taskName: engineEvent.entity.name || '', assignee: engineEvent.entity.assignee }); message = this.translateService.instant('NOTIFICATIONS.TASK_ASSIGNED', {
taskName: engineEvent.entity.name || '',
assignee: engineEvent.entity.assignee
});
this.pushNotification(engineEvent, message); this.pushNotification(engineEvent, message);
break; break;
case 'TASK_UPDATED': case 'TASK_UPDATED':

View File

@@ -1,58 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { AboutPage, ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
describe('About Content Services', () => {
const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
const aboutPage = new AboutPage();
let acsUser: UserModel;
const apiService = new ApiService();
const usersActions = new UsersActions(apiService);
beforeAll(async() => {
await apiService.loginWithProfile('admin');
acsUser = await usersActions.createUser();
await apiService.login(acsUser.username, acsUser.password);
await loginPage.login(acsUser.username, acsUser.password);
await navigationBarPage.clickAboutButton();
});
afterAll(async () => {
await navigationBarPage.clickLogoutButton();
});
it('[C280002] Should be able to view about content services info', async () => {
await aboutPage.checkAppTitleIsDisplayed();
await aboutPage.checkSourceCodeTitleIsDisplayed();
await aboutPage.checkGithubUrlIsDisplayed();
await aboutPage.checkGithubVersionIsDisplayed();
await aboutPage.checkEcmHostIsDisplayed();
await aboutPage.checkEcmEditionIsDisplayed();
await aboutPage.checkEcmVersionIsDisplayed();
await aboutPage.checkAboutListIsLoaded();
await aboutPage.checkPackageColumnsIsDisplayed();
await aboutPage.checkEcmStatusTitleIsDisplayed();
await aboutPage.checkStatusColumnsIsDisplayed();
await aboutPage.checkEcmLicenseTitleIsDisplayed();
await aboutPage.checkLicenseColumnsIsDisplayed();
await aboutPage.checkEcmModulesTitleIsDisplayed();
await aboutPage.checkModulesColumnsIsDisplayed();
});
});

View File

@@ -24,13 +24,13 @@ import {
UsersActions, UsersActions,
WaitActions WaitActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ContentServicesPage } from '../core/pages/content-services.page'; import { ContentServicesPage } from '../../core/pages/content-services.page';
import { LockFilePage } from '../content-services/pages/lock-file.page'; import { LockFilePage } from '../../content-services/pages/lock-file.page';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NodeEntry } from '@alfresco/js-api'; import { NodeEntry } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Lock File', () => { describe('Lock File', () => {

View File

@@ -15,10 +15,10 @@
* limitations under the License. * limitations under the License.
*/ */
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ApiService, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
import { TagPage } from '../content-services/pages/tag.page'; import { TagPage } from '../../content-services/pages/tag.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Tag component', () => { describe('Tag component', () => {

View File

@@ -16,8 +16,8 @@
*/ */
import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TreeViewPage } from './pages/tree-view.page'; import { TreeViewPage } from './../pages/tree-view.page';
describe('Tree View Component', () => { describe('Tree View Component', () => {

View File

@@ -66,8 +66,7 @@ describe('Restore content directive', () => {
let testFolder: NodeEntry; let testFolder: NodeEntry;
const uploadActions = new UploadActions(apiService); const uploadActions = new UploadActions(apiService);
let folderWithContent, folderWithFolder, subFolder, subFile, testFile, restoreFile, publicSite, siteFolder, let folderWithContent, folderWithFolder, subFolder, subFile, testFile;
siteFile;
beforeAll(async () => { beforeAll(async () => {
await apiService.loginWithProfile('admin'); await apiService.loginWithProfile('admin');
@@ -81,7 +80,6 @@ describe('Restore content directive', () => {
testFile = await uploadActions.uploadFile(pdfFileModel.location, pdfFileModel.name, '-my-'); testFile = await uploadActions.uploadFile(pdfFileModel.location, pdfFileModel.name, '-my-');
folderWithFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-'); folderWithFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
subFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), folderWithFolder.entry.id); subFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), folderWithFolder.entry.id);
restoreFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
}); });
afterAll(async () => { afterAll(async () => {
@@ -223,81 +221,6 @@ describe('Restore content directive', () => {
await contentServicesPage.openFolder(folderWithFolder.entry.name); await contentServicesPage.openFolder(folderWithFolder.entry.name);
await contentServicesPage.checkContentIsDisplayed(subFolder.entry.name); await contentServicesPage.checkContentIsDisplayed(subFolder.entry.name);
}); });
it('[C260241] Should display restore icon both for file and folder', async () => {
await contentServicesPage.checkContentIsDisplayed(testFolder.entry.name);
await contentServicesPage.checkContentIsDisplayed(restoreFile.entry.name);
await contentServicesPage.deleteContent(testFolder.entry.name);
await contentServicesPage.deleteContent(restoreFile.entry.name);
await navigationBarPage.clickTrashcanButton();
await trashcanPage.waitForTableBody();
await trashcanPage.checkRestoreButtonIsNotDisplayed();
await trashcanPage.getDocumentList().dataTablePage().clickRowByContentCheckbox(testFolder.entry.name);
await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(testFolder.entry.name);
await trashcanPage.checkRestoreButtonIsDisplayed();
await trashcanPage.getDocumentList().dataTablePage().clickRowByContentCheckbox(testFolder.entry.name);
await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsNotSelected(testFolder.entry.name);
await trashcanPage.getDocumentList().dataTablePage().clickRowByContentCheckbox(restoreFile.entry.name);
await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(restoreFile.entry.name);
await trashcanPage.checkRestoreButtonIsDisplayed();
await trashcanPage.getDocumentList().dataTablePage().clickRowByContentCheckbox(testFolder.entry.name);
await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(testFolder.entry.name);
await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(restoreFile.entry.name);
await trashcanPage.checkRestoreButtonIsDisplayed();
});
});
describe('Restore deleted library', () => {
beforeAll(async () => {
await apiService.login(acsUser.username, acsUser.password);
const publicSiteName = `public-${StringUtil.generateRandomString(5)}`;
const publicSiteBody = { visibility: 'PUBLIC', title: publicSiteName };
publicSite = await apiService.getInstance().core.sitesApi.createSite(publicSiteBody);
siteFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), publicSite.entry.guid);
siteFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, siteFolder.entry.id);
await apiService.getInstance().core.sitesApi.deleteSite(publicSite.entry.id);
});
afterEach(async () => {
await navigationBarPage.clickLogoutButton();
});
beforeEach(async () => {
await loginPage.login(acsUser.username, acsUser.password);
await navigationBarPage.navigateToContentServices();
await contentServicesPage.waitForTableBody();
});
afterAll(async () => {
try {
await apiService.loginWithProfile('admin');
await apiService.getInstance().core.sitesApi.deleteSite(publicSite.entry.id, { permanent: true });
} catch (error) {
}
});
it('[C260241] Should restore the deleted library along with contents inside', async () => {
await navigationBarPage.clickTrashcanButton();
await trashcanPage.waitForTableBody();
await trashcanPage.getDocumentList().dataTablePage().checkRowContentIsDisplayed(publicSite.entry.id);
await trashcanPage.getDocumentList().dataTablePage().clickRowByContentCheckbox(publicSite.entry.id);
await trashcanPage.getDocumentList().dataTablePage().checkRowByContentIsSelected(publicSite.entry.id);
await trashcanPage.clickRestore();
await waitActions.nodeIsPresent(publicSite.entry.guid);
await navigationBarPage.goToSite(publicSite);
await contentServicesPage.waitForTableBody();
await contentServicesPage.checkContentIsDisplayed(siteFolder.entry.name);
await contentServicesPage.openFolder(siteFolder.entry.name);
await contentServicesPage.checkContentIsDisplayed(siteFile.entry.name);
await notificationHistoryPage.checkNotifyContains(publicSite.entry.id + ' item restored');
});
}); });
describe('Restore with folder hierarchies', () => { describe('Restore with folder hierarchies', () => {

View File

@@ -1,135 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {
ApiService,
LoginPage,
PaginationPage,
StringUtil,
UploadActions,
UserModel,
UsersActions
} from '@alfresco/adf-testing';
import { browser } from 'protractor';
import { FolderModel } from '../models/ACS/folder.model';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
import { TrashcanPage } from '../core/pages/trashcan.page';
describe('Trashcan - Pagination', () => {
const pagination = {
base: 'newFile',
extension: '.txt'
};
const itemsPerPage = {
five: '5',
fiveValue: 5,
ten: '10',
tenValue: 10,
fifteen: '15',
fifteenValue: 15,
twenty: '20',
twentyValue: 20,
default: '25'
};
const loginPage = new LoginPage();
const trashcanPage = new TrashcanPage();
const paginationPage = new PaginationPage();
const navigationBarPage = new NavigationBarPage();
const apiService = new ApiService();
const usersActions = new UsersActions(apiService);
let acsUser: UserModel;
const newFolderModel = new FolderModel({ name: 'newFolder' });
const noOfFiles = 20;
beforeAll(async () => {
const uploadActions = new UploadActions(apiService);
const fileNames = StringUtil.generateFilesNames(10, noOfFiles + 9, pagination.base, pagination.extension);
await apiService.loginWithProfile('admin');
acsUser = await usersActions.createUser();
await apiService.login(acsUser.username, acsUser.password);
const folderUploadedModel = await uploadActions.createFolder(newFolderModel.name, '-my-');
const emptyFiles: any = await uploadActions.createEmptyFiles(fileNames, folderUploadedModel.entry.id);
for (const entry of emptyFiles.list.entries) {
await apiService.getInstance().node.deleteNode(entry.entry.id).then(() => {}, async () => {
await apiService.getInstance().node.deleteNode(entry.entry.id);
});
}
await loginPage.login(acsUser.username, acsUser.password);
await navigationBarPage.clickTrashcanButton();
await trashcanPage.getDocumentList().dataTablePage().waitTillContentLoaded();
});
afterAll(async () => {
await navigationBarPage.clickLogoutButton();
});
afterEach(async () => {
await browser.refresh();
await trashcanPage.getDocumentList().dataTablePage().waitTillContentLoaded();
});
it('[C272811] Should be able to set Items per page to 20', async () => {
await paginationPage.selectItemsPerPage(itemsPerPage.twenty);
await trashcanPage.waitForTableBody();
await trashcanPage.waitForPagination();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.twenty);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + noOfFiles + ' of ' + noOfFiles);
await expect(await trashcanPage.numberOfResultsDisplayed()).toBe(noOfFiles);
await paginationPage.checkNextPageButtonIsDisabled();
await paginationPage.checkPreviousPageButtonIsDisabled();
});
it('[C276742] Should be able to set Items per page to 15', async () => {
await paginationPage.selectItemsPerPage(itemsPerPage.fifteen);
await trashcanPage.waitForTableBody();
await trashcanPage.waitForPagination();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue + ' of ' + noOfFiles);
await expect(await trashcanPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fifteenValue);
await paginationPage.checkNextPageButtonIsEnabled();
await paginationPage.checkPreviousPageButtonIsDisabled();
});
it('[C276743] Should be able to set Items per page to 10', async () => {
await paginationPage.selectItemsPerPage(itemsPerPage.ten);
await trashcanPage.waitForTableBody();
await trashcanPage.waitForPagination();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue + ' of ' + noOfFiles);
await expect(await trashcanPage.numberOfResultsDisplayed()).toBe(itemsPerPage.tenValue);
await paginationPage.checkNextPageButtonIsEnabled();
await paginationPage.checkPreviousPageButtonIsDisabled();
});
it('[C276744] Should be able to set Items per page to 5', async () => {
await paginationPage.selectItemsPerPage(itemsPerPage.five);
await trashcanPage.waitForTableBody();
await trashcanPage.waitForPagination();
await expect(await paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five);
await expect(await paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fiveValue + ' of ' + noOfFiles);
await expect(await trashcanPage.numberOfResultsDisplayed()).toBe(itemsPerPage.fiveValue);
await paginationPage.checkNextPageButtonIsEnabled();
await paginationPage.checkPreviousPageButtonIsDisabled();
});
})
;

View File

@@ -1,221 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { BrowserActions, LocalStorageUtil, SettingsPage } from '@alfresco/adf-testing';
import { browser, protractor } from 'protractor';
import { ContentServicesPage } from '../core/pages/content-services.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
import { ProcessServicesPage } from '../process-services/pages/process-services.page';
import { LoginShellPage } from '../core/pages/login-shell.page';
describe('Settings component', () => {
const loginPage = new LoginShellPage();
const settingsPage = new SettingsPage();
const navigationBarPage = new NavigationBarPage();
const processServicesPage = new ProcessServicesPage();
const contentServicesPage = new ContentServicesPage();
const loginError = 'Request has been terminated ' +
'Possible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.';
describe('Should be able to change Urls in the Settings', () => {
beforeAll(async () => {
await LocalStorageUtil.setStorageItem('authType', 'BASIC');
await browser.refresh();
});
beforeEach(async () => {
await settingsPage.goToSettingsPage();
});
it('[C245641] Should navigate User from Settings page to Login screen', async () => {
await settingsPage.clickBackButton();
await loginPage.waitForElements();
});
it('[C291948] Should save ALL Settings changes when User clicks Apply button', async () => {
await loginPage.goToLoginPage();
await loginPage.clickSettingsIcon();
await settingsPage.setProviderEcmBpm();
await loginPage.waitForElements();
await settingsPage.goToSettingsPage();
await expect(await settingsPage.getSelectedOptionText()).toEqual('ALL', 'The Settings changes are not saved');
await expect(await settingsPage.getBpmHostUrl()).toEqual(browser.params.testConfig.appConfig.bpmHost, 'The BPM Settings changes are not saved');
await expect(await settingsPage.getEcmHostUrl()).toEqual(browser.params.testConfig.appConfig.ecmHost, 'The ECM Settings changes are not saved');
});
it('[C291949] Should have field validation for Content Services Url', async () => {
await settingsPage.setProvider('ALL');
await settingsPage.clearContentServicesURL();
await settingsPage.ecmText.sendKeys(protractor.Key.TAB);
await settingsPage.checkValidationMessageIsDisplayed();
await settingsPage.checkApplyButtonIsDisabled();
});
it('[C291950] Should have field validation for Process Services Url', async () => {
await settingsPage.setProvider('ALL');
await settingsPage.clearProcessServicesURL();
await settingsPage.bpmText.sendKeys(protractor.Key.TAB);
await settingsPage.checkValidationMessageIsDisplayed();
await settingsPage.checkApplyButtonIsDisabled();
});
it('[C291951] Should not be able to sign in with invalid Content Services Url', async () => {
await settingsPage.setProvider('ECM');
await settingsPage.setContentServicesURL('http://localhost:7070');
await settingsPage.clickApply();
await loginPage.waitForElements();
await loginPage.enterUsername(browser.params.testConfig.users.admin.username);
await loginPage.enterPassword(browser.params.testConfig.users.admin.password);
await loginPage.clickSignInButton();
await loginPage.checkLoginErrorIsDisplayed(loginError);
});
it('[C291952] Should not be able to sign in with invalid Process Services Url', async () => {
await settingsPage.setProvider('BPM');
await settingsPage.setProcessServicesURL('http://localhost:7070');
await settingsPage.clickApply();
await loginPage.waitForElements();
await loginPage.enterUsername(browser.params.testConfig.users.admin.username);
await loginPage.enterPassword(browser.params.testConfig.users.admin.password);
await loginPage.clickSignInButton();
await loginPage.checkLoginErrorIsDisplayed(loginError);
});
});
describe('Settings Component - Basic Authentication', () => {
beforeAll(async () => {
await LocalStorageUtil.setStorageItem('authType', 'OAUTH');
await browser.refresh();
await settingsPage.goToSettingsPage();
await settingsPage.setProvider('ALL');
await settingsPage.setContentServicesURL(browser.params.testConfig.appConfig.ecmHost);
await settingsPage.setProcessServicesURL(browser.params.testConfig.appConfig.bpmHost);
await settingsPage.setImplicitFlow(false);
await settingsPage.setSilentLogin(false);
await settingsPage.clickApply();
});
beforeEach(async () => {
await loginPage.goToLoginPage();
await loginPage.clickSettingsIcon();
await settingsPage.checkProviderDropdownIsDisplayed();
});
it('[C277751] Should allow the User to login to Process Services using the BPM selection on Settings page', async () => {
await settingsPage.checkProviderOptions();
await settingsPage.checkBasicAuthRadioIsSelected();
await settingsPage.checkSsoRadioIsNotSelected();
await expect(await settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.appConfig.ecmHost);
await expect(await settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.appConfig.bpmHost);
await expect(await settingsPage.getBackButton().isEnabled()).toBe(true);
await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
await loginPage.goToLoginPage();
await loginPage.clickSettingsIcon();
await settingsPage.checkProviderDropdownIsDisplayed();
await settingsPage.setProvider('BPM');
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await loginPage.clickSettingsIcon();
await settingsPage.checkProviderDropdownIsDisplayed();
await settingsPage.setProviderBpm();
await loginPage.waitForElements();
await loginPage.enterUsername(browser.params.testConfig.users.admin.username);
await loginPage.enterPassword(browser.params.testConfig.users.admin.password);
await loginPage.clickSignInButton();
await navigationBarPage.navigateToProcessServicesPage();
await processServicesPage.checkApsContainer();
await processServicesPage.checkAppIsDisplayed('Task App');
await navigationBarPage.clickSettingsButton();
await expect(await settingsPage.getSelectedOptionText()).toBe('BPM');
await settingsPage.checkBasicAuthRadioIsSelected();
await settingsPage.checkSsoRadioIsNotSelected();
await expect(await settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.appConfig.bpmHost);
await expect(await settingsPage.getBackButton().isEnabled()).toBe(true);
await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await BrowserActions.getUrl(browser.baseUrl + '/activiti');
await processServicesPage.checkApsContainer();
await processServicesPage.checkAppIsDisplayed('Task App');
});
it('[C277752] Should allow the User to login to Content Services using the ECM selection on Settings page', async () => {
await settingsPage.setProvider('ECM');
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await loginPage.clickSettingsIcon();
await settingsPage.checkProviderDropdownIsDisplayed();
await settingsPage.setProviderEcm();
await loginPage.waitForElements();
await loginPage.enterUsername(browser.params.testConfig.users.admin.username);
await loginPage.enterPassword(browser.params.testConfig.users.admin.password);
await loginPage.clickSignInButton();
await navigationBarPage.navigateToContentServices();
await contentServicesPage.checkAcsContainer();
await navigationBarPage.clickSettingsButton();
await expect(await settingsPage.getSelectedOptionText()).toBe('ECM');
await settingsPage.checkBasicAuthRadioIsSelected();
await settingsPage.checkSsoRadioIsNotSelected();
await expect(await settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.appConfig.ecmHost);
await expect(await settingsPage.getBackButton().isEnabled()).toBe(true);
await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await BrowserActions.getUrl(browser.baseUrl + '/files');
await contentServicesPage.checkAcsContainer();
});
it('[C277753] Should allow the User to login to both Process Services and Content Services using the ALL selection on Settings Page', async () => {
await settingsPage.setProvider('ALL');
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await loginPage.clickSettingsIcon();
await settingsPage.checkProviderDropdownIsDisplayed();
await settingsPage.setProviderEcmBpm();
await loginPage.waitForElements();
await loginPage.enterUsername(browser.params.testConfig.users.admin.username);
await loginPage.enterPassword(browser.params.testConfig.users.admin.password);
await loginPage.clickSignInButton();
await navigationBarPage.navigateToContentServices();
await contentServicesPage.checkAcsContainer();
await navigationBarPage.navigateToProcessServicesPage();
await processServicesPage.checkApsContainer();
await processServicesPage.checkAppIsDisplayed('Task App');
await navigationBarPage.clickSettingsButton();
await expect(await settingsPage.getSelectedOptionText()).toBe('ALL');
await settingsPage.checkBasicAuthRadioIsSelected();
await settingsPage.checkSsoRadioIsNotSelected();
await expect(await settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.appConfig.ecmHost);
await expect(await settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.appConfig.bpmHost);
await expect(await settingsPage.getBackButton().isEnabled()).toBe(true);
await expect(await settingsPage.getApplyButton().isEnabled()).toBe(true);
await settingsPage.clickBackButton();
await loginPage.waitForElements();
await BrowserActions.getUrl(browser.baseUrl + '/files');
await contentServicesPage.checkAcsContainer();
await BrowserActions.getUrl(browser.baseUrl + '/activiti');
await processServicesPage.checkApsContainer();
await processServicesPage.checkAppIsDisplayed('Task App');
});
});
});

View File

@@ -1,53 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { ApiService, IdentityService, AboutPage, LoginPage } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
describe('About Process Services Cloud', () => {
const loginSSOPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
const aboutPage = new AboutPage();
const apiService = new ApiService();
const identityService = new IdentityService(apiService);
let testUser;
beforeAll(async () => {
await apiService.loginWithProfile('identityAdmin');
testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER, identityService.ROLES.ACTIVITI_DEVOPS]);
await loginSSOPage.login(testUser.username, testUser.password);
await apiService.login(testUser.username, testUser.password);
await navigationBarPage.clickAboutButton();
});
afterAll(async () => {
await apiService.loginWithProfile('identityAdmin');
await identityService.deleteIdentityUser(testUser.idIdentityService);
});
it('[C280002] Should be able to view about process services cloud info', async () => {
await aboutPage.checkAppTitleIsDisplayed();
await aboutPage.checkSourceCodeTitleIsDisplayed();
await aboutPage.checkGithubUrlIsDisplayed();
await aboutPage.checkGithubVersionIsDisplayed();
await aboutPage.checkBpmHostIsDisplayed();
await aboutPage.checkEcmHostIsDisplayed();
});
});

View File

@@ -21,7 +21,7 @@ import {
TaskFiltersCloudComponentPage, TaskFiltersCloudComponentPage,
EditTaskFilterCloudComponentPage, EditTaskFilterCloudComponentPage,
TaskListCloudComponentPage, TaskListCloudComponentPage,
BrowserActions, DropdownPage, Logger, TestElement BrowserActions, DropdownPage, TestElement, DataTableComponentPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
export class TasksCloudDemoPage { export class TasksCloudDemoPage {
@@ -52,6 +52,7 @@ export class TasksCloudDemoPage {
editTaskFilterCloud = new EditTaskFilterCloudComponentPage(); editTaskFilterCloud = new EditTaskFilterCloudComponentPage();
taskFilterCloudComponent = new TaskFiltersCloudComponentPage(); taskFilterCloudComponent = new TaskFiltersCloudComponentPage();
dataTableComponentPage = new DataTableComponentPage();
async disableDisplayTaskDetails(): Promise<void> { async disableDisplayTaskDetails(): Promise<void> {
await this.togglePage.disableToggle(this.displayTaskDetailsToggle); await this.togglePage.disableToggle(this.displayTaskDetailsToggle);
@@ -161,22 +162,6 @@ export class TasksCloudDemoPage {
} }
async waitTillContentLoaded(): Promise<void> { async waitTillContentLoaded(): Promise<void> {
if (await this.isSpinnerPresent()) { await this.dataTableComponentPage.waitTillContentLoaded();
Logger.log('wait loading spinner disappear');
await this.spinner.waitNotPresent();
} else {
try {
Logger.log('wait loading spinner is present');
await this.spinner.waitPresent();
} catch {}
}
}
private async isSpinnerPresent(): Promise<boolean> {
try {
return await this.spinner.isDisplayed();
} catch {
return false;
}
} }
} }

View File

@@ -25,8 +25,8 @@ import {
RolesService RolesService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { PeopleGroupCloudComponentPage } from './pages/people-group-cloud-component.page'; import { PeopleGroupCloudComponentPage } from './../pages/people-group-cloud-component.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
describe('People Groups Cloud Component', () => { describe('People Groups Cloud Component', () => {

View File

@@ -17,8 +17,8 @@
import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { PeopleGroupCloudComponentPage } from './pages/people-group-cloud-component.page'; import { PeopleGroupCloudComponentPage } from './../pages/people-group-cloud-component.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
describe('People Groups Cloud Component', () => { describe('People Groups Cloud Component', () => {

View File

@@ -31,11 +31,11 @@ import {
TasksService TasksService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { EditProcessFilterConfiguration } from './../config/edit-process-filter.config';
import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { ProcessListCloudConfiguration } from './../config/process-list-cloud.config';
describe('Process list cloud', () => { describe('Process list cloud', () => {

View File

@@ -30,12 +30,12 @@ import {
TasksService TasksService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessListPage } from '../process-services/pages/process-list.page'; import { ProcessListPage } from '../../process-services/pages/process-list.page';
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { EditProcessFilterConfiguration } from './../config/edit-process-filter.config';
import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { ProcessListCloudConfiguration } from './../config/process-list-cloud.config';
import moment = require('moment'); import moment = require('moment');
describe('Process filters cloud', () => { describe('Process filters cloud', () => {

View File

@@ -27,12 +27,12 @@ import {
TaskHeaderCloudPage TaskHeaderCloudPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser, protractor } from 'protractor'; import { browser, protractor } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { ProcessDetailsCloudDemoPage } from './pages/process-details-cloud-demo.page'; import { ProcessDetailsCloudDemoPage } from './../pages/process-details-cloud-demo.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { EditProcessFilterConfiguration } from './../config/edit-process-filter.config';
import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; import { ProcessListCloudConfiguration } from './../config/process-list-cloud.config';
import { import {
ProcessDefinitionCloud, ProcessDefinitionCloud,
ProcessInstanceCloud, ProcessInstanceCloud,

View File

@@ -29,10 +29,10 @@ import {
EditProcessFilterCloudComponentPage EditProcessFilterCloudComponentPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Process filters cloud', () => { describe('Process filters cloud', () => {

View File

@@ -17,12 +17,12 @@
import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing'; import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil, LocalStorageUtil } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import moment = require('moment'); import moment = require('moment');
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { EditProcessFilterConfiguration } from './../config/edit-process-filter.config';
describe('Process Header cloud component', () => { describe('Process Header cloud component', () => {

View File

@@ -17,12 +17,12 @@
import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, LocalStorageUtil } from '@alfresco/adf-testing'; import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginPage, ProcessDefinitionsService, ProcessInstancesService, LocalStorageUtil } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessDetailsCloudDemoPage } from './pages/process-details-cloud-demo.page'; import { ProcessDetailsCloudDemoPage } from './../pages/process-details-cloud-demo.page';
import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; import { EditProcessFilterConfiguration } from './../config/edit-process-filter.config';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Process list cloud', () => { describe('Process list cloud', () => {

View File

@@ -33,10 +33,10 @@ import {
UploadActions, UploadActions,
ViewerPage ViewerPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Process Task - Attach content file', () => { describe('Process Task - Attach content file', () => {
@@ -78,19 +78,19 @@ describe('Process Task - Attach content file', () => {
let groupInfo: any; let groupInfo: any;
const pdfFileOne = { const pdfFileOne = {
'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_path
}; };
const pdfFileTwo = { const pdfFileTwo = {
'name': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name, 'name': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_name,
'location': browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path 'location': browser.params.resources.Files.ADF_DOCUMENTS.PNG_B.file_path
}; };
beforeAll(async () => { beforeAll(async () => {
await apiService.loginWithProfile('identityAdmin'); await apiService.loginWithProfile('identityAdmin');
testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]);
groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
@@ -166,7 +166,7 @@ describe('Process Task - Attach content file', () => {
await processList.checkContentIsDisplayedById(processInstance.entry.id); await processList.checkContentIsDisplayedById(processInstance.entry.id);
}); });
async function viewAttachedFile(contentUploadWidget, fileName: string): Promise<void> { async function viewAttachedFile(contentUploadWidget: any, fileName: string): Promise<void> {
await contentUploadWidget.checkFileIsAttached(fileName); await contentUploadWidget.checkFileIsAttached(fileName);
await contentUploadWidget.viewFile(fileName); await contentUploadWidget.viewFile(fileName);

View File

@@ -1,88 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { browser
} from 'protractor';
import {
LoginPage,
ApiService,
IdentityService,
GroupIdentityService,
ProcessDefinitionsService,
ProcessInstancesService
} from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
import { ServiceTaskListPage } from './pages/service-task-list.page';
import CONSTANTS = require('../util/constants');
describe('Service task list cloud', () => {
describe('Service Task Filters', () => {
const loginSSOPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
const serviceTaskListPage = new ServiceTaskListPage();
const apiService = new ApiService();
const identityService = new IdentityService(apiService);
const groupIdentityService = new GroupIdentityService(apiService);
const processDefinitionService = new ProcessDefinitionsService(apiService);
const processInstancesService = new ProcessInstancesService(apiService);
const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
/* cspell:disable-next-line */
const activityNameSimpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.processes.multiinstanceservicetask;
let testUser, groupInfo;
beforeAll(async () => {
await apiService.loginWithProfile('identityAdmin');
testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]);
groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
await apiService.login(testUser.email, testUser.password);
const processDefinition = await processDefinitionService
/* cspell:disable-next-line */
.getProcessDefinitionByName(browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.processes.multiinstanceservicetask, simpleApp);
await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp);
/* cspell:disable-next-line */
await loginSSOPage.login(browser.params.testConfig.users.superadmin.username, browser.params.testConfig.users.superadmin.password);
});
afterAll(async () => {
await apiService.loginWithProfile('identityAdmin');
await identityService.deleteIdentityUser(testUser.idIdentityService);
});
it('[C587515] Should be able to select a filter service task and see only the service task related to the selected app', async () => {
await navigationBarPage.navigateToServiceTaskListCloudPage();
await serviceTaskListPage.checkServiceTaskFiltersDisplayed();
await serviceTaskListPage.checkSearchServiceTaskFiltersDisplayed();
await serviceTaskListPage.checkServiceTaskListDisplayed();
await serviceTaskListPage.clickCompletedServiceTask();
await serviceTaskListPage.clickSearchHeaderServiceTask();
await serviceTaskListPage.searchByActivityName(activityNameSimpleApp);
await serviceTaskListPage.checkServiceTaskListResultsIsLoaded();
await expect(await serviceTaskListPage.getStatusText()).toBe(CONSTANTS.SERVICE_TASK_STATUS.COMPLETED);
});
});
});

View File

@@ -17,9 +17,9 @@
import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing'; import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing';
import { browser, protractor } from 'protractor'; import { browser, protractor } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Start Process', () => { describe('Start Process', () => {

View File

@@ -16,8 +16,8 @@
*/ */
import { browser, protractor } from 'protractor'; import { browser, protractor } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { import {
LoginPage, LoginPage,
AppListCloudPage, AppListCloudPage,
@@ -40,11 +40,11 @@ import {
FileBrowserUtil, ProcessCloudWidgetPage, FileBrowserUtil, ProcessCloudWidgetPage,
QueryService QueryService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { StartProcessCloudConfiguration } from './config/start-process-cloud.config'; import { StartProcessCloudConfiguration } from './../config/start-process-cloud.config';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from './../pages/process-cloud-demo.page';
import { ProcessDetailsCloudDemoPage } from './pages/process-details-cloud-demo.page'; import { ProcessDetailsCloudDemoPage } from './../pages/process-details-cloud-demo.page';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Start Task Form', () => { describe('Start Task Form', () => {

View File

@@ -17,7 +17,7 @@
import { ApiService, Application, AppListCloudPage, IdentityService, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing'; import { ApiService, Application, AppListCloudPage, IdentityService, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
describe('Applications list', () => { describe('Applications list', () => {

View File

@@ -23,10 +23,10 @@ import {
LoginPage LoginPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessCloudDemoPage } from './pages/process-cloud-demo.page'; import { ProcessCloudDemoPage } from '../pages/process-cloud-demo.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from '../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Edit process filters cloud', () => { describe('Edit process filters cloud', () => {
@@ -102,10 +102,10 @@ describe('Edit process filters cloud', () => {
it('[C291805] New process filter is added when clicking Save As button', async () => { it('[C291805] New process filter is added when clicking Save As button', async () => {
await createNewProcessCustomFilter('New'); await createNewProcessCustomFilter('New');
await browser.driver.sleep(1000);
await expect(await processFilter.getActiveFilterName()).toBe('New'); await expect(await processFilter.getActiveFilterName()).toBe('New');
await editProcessFilter.openFilter(); await editProcessFilter.openFilter();
await expect(await editProcessFilter.getSortFilterDropDownValue()).toEqual('Id'); await expect(await editProcessFilter.getSortFilterDropDownValue()).toEqual('Id');
await processFilter.clickAllProcessesFilter(); await processFilter.clickAllProcessesFilter();
await expect(await editProcessFilter.getSortFilterDropDownValue()).toEqual('Start Date'); await expect(await editProcessFilter.getSortFilterDropDownValue()).toEqual('Start Date');
@@ -115,18 +115,16 @@ describe('Edit process filters cloud', () => {
}); });
it('[C291807] A process filter is updated when clicking on save button', async () => { it('[C291807] A process filter is updated when clicking on save button', async () => {
await editProcessFilter.setSortFilterDropDown('Id'); await createNewProcessCustomFilter('New');
await processFilter.clickAllProcessesFilter();
await editProcessFilter.saveAs('New');
await expect(await processFilter.getActiveFilterName()).toBe('New'); await expect(await processFilter.getActiveFilterName()).toBe('New');
await editProcessFilter.openFilter(); await editProcessFilter.openFilter();
await editProcessFilter.checkCustomiseFilterHeaderIsExpanded(); await editProcessFilter.checkCustomiseFilterHeaderIsExpanded();
await expect(await editProcessFilter.getSortFilterDropDownValue()).toEqual('Id');
await editProcessFilter.setSortFilterDropDown('Process Name'); await editProcessFilter.setSortFilterDropDown('Process Name');
await expect(await editProcessFilter.getSortFilterDropDownValue()).toEqual('Process Name'); await expect(await editProcessFilter.getSortFilterDropDownValue()).toEqual('Process Name');
await editProcessFilter.clickSaveButton(); await editProcessFilter.clickSaveButton();
await editProcessFilter.openFilter(); await editProcessFilter.openFilter();
await editProcessFilter.checkCustomiseFilterHeaderIsExpanded(); await editProcessFilter.checkCustomiseFilterHeaderIsExpanded();
await browser.driver.sleep(1000); await browser.driver.sleep(1000);
@@ -137,9 +135,7 @@ describe('Edit process filters cloud', () => {
}); });
it('[C291808] A process filter is deleted when clicking on delete button', async () => { it('[C291808] A process filter is deleted when clicking on delete button', async () => {
await editProcessFilter.setSortFilterDropDown('Id'); await createNewProcessCustomFilter('New');
await processFilter.clickAllProcessesFilter();
await editProcessFilter.saveAs('New');
await editProcessFilter.openFilter(); await editProcessFilter.openFilter();
await expect(await processFilter.getActiveFilterName()).toBe('New'); await expect(await processFilter.getActiveFilterName()).toBe('New');
@@ -172,7 +168,6 @@ describe('Edit process filters cloud', () => {
it('[C291811] Save button of process filter dialog should be disabled when process name is empty', async () => { it('[C291811] Save button of process filter dialog should be disabled when process name is empty', async () => {
await editProcessFilter.setSortFilterDropDown('Id'); await editProcessFilter.setSortFilterDropDown('Id');
await processFilter.clickAllProcessesFilter();
await editProcessFilter.clickSaveAsButton(); await editProcessFilter.clickSaveAsButton();
const dialog = editProcessFilter.editProcessFilterDialog(); const dialog = editProcessFilter.editProcessFilterDialog();
@@ -192,7 +187,6 @@ describe('Edit process filters cloud', () => {
it('[C291809] Process filter dialog is displayed when clicking on Save As button', async () => { it('[C291809] Process filter dialog is displayed when clicking on Save As button', async () => {
await editProcessFilter.setSortFilterDropDown('Name'); await editProcessFilter.setSortFilterDropDown('Name');
await processFilter.clickAllProcessesFilter();
await editProcessFilter.clickSaveAsButton(); await editProcessFilter.clickSaveAsButton();
const dialog = editProcessFilter.editProcessFilterDialog(); const dialog = editProcessFilter.editProcessFilterDialog();
@@ -204,9 +198,9 @@ describe('Edit process filters cloud', () => {
await dialog.clickOnCancelButton(); await dialog.clickOnCancelButton();
}); });
async function createNewProcessCustomFilter(name: string): Promise<void> { async function createNewProcessCustomFilter(name: string, sort = 'Id'): Promise<void> {
await editProcessFilter.setSortFilterDropDown('Id');
await processFilter.clickAllProcessesFilter(); await processFilter.clickAllProcessesFilter();
await editProcessFilter.setSortFilterDropDown(sort);
await editProcessFilter.saveAs(name); await editProcessFilter.saveAs(name);
} }
}); });

View File

@@ -25,8 +25,8 @@ import {
IdentityService, IdentityService,
GroupIdentityService GroupIdentityService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
describe('Edit task filters cloud', () => { describe('Edit task filters cloud', () => {

View File

@@ -29,8 +29,8 @@ import {
ProcessDefinitionsService, ProcessDefinitionsService,
QueryService QueryService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
describe('Task counters cloud', () => { describe('Task counters cloud', () => {

View File

@@ -26,8 +26,8 @@ import {
GroupIdentityService, GroupIdentityService,
QueryService QueryService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
describe('Task filters cloud', () => { describe('Task filters cloud', () => {

View File

@@ -28,8 +28,8 @@ import {
TaskFormCloudComponent, TaskFormCloudComponent,
IdentityService, GroupIdentityService, ProcessCloudWidgetPage, FormCloudService IdentityService, GroupIdentityService, ProcessCloudWidgetPage, FormCloudService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
describe('Task form cloud component', () => { describe('Task form cloud component', () => {

View File

@@ -30,8 +30,8 @@ import {
TasksService, TasksService,
FormCloudService FormCloudService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
describe('Task form cloud component', () => { describe('Task form cloud component', () => {

View File

@@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import { import {
ApiService, ApiService,
AppListCloudPage, AppListCloudPage,
@@ -29,8 +29,8 @@ import {
PeopleCloudComponentPage PeopleCloudComponentPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import moment = require('moment'); import moment = require('moment');
const isValueInvalid = (value: any): boolean => { const isValueInvalid = (value: any): boolean => {

View File

@@ -21,9 +21,9 @@ import {
LoginPage, ApiService, LoginPage, ApiService,
AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; import { TaskListCloudConfiguration } from './../config/task-list-cloud.config';
describe('Edit task filters and task list properties', () => { describe('Edit task filters and task list properties', () => {
const SORT_ORDER = { const SORT_ORDER = {

View File

@@ -22,11 +22,11 @@ import {
LoginPage, ApiService, LoginPage, ApiService,
AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService, DateUtil AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService, DateUtil
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { TaskListCloudConfiguration } from './config/task-list-cloud.config'; import { TaskListCloudConfiguration } from './../config/task-list-cloud.config';
import moment = require('moment'); import moment = require('moment');
import { taskFilterConfiguration } from './config/task-filter.config'; import { taskFilterConfiguration } from './../config/task-filter.config';
describe('Edit task filters and task list properties', () => { describe('Edit task filters and task list properties', () => {

View File

@@ -25,8 +25,8 @@ import {
TasksService TasksService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
describe('Task list cloud - selection', () => { describe('Task list cloud - selection', () => {

View File

@@ -28,10 +28,10 @@ import {
TaskFormCloudComponent, TaskFormCloudComponent,
TaskHeaderCloudPage TaskHeaderCloudPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
import { ProcessInstanceCloud } from '@alfresco/adf-process-services-cloud'; import { ProcessInstanceCloud } from '@alfresco/adf-process-services-cloud';
import { taskFilterConfiguration } from './config/task-filter.config'; import { taskFilterConfiguration } from './../config/task-filter.config';
describe('Task claim/release', () => { describe('Task claim/release', () => {

View File

@@ -29,8 +29,8 @@ import {
GroupIdentityService, GroupIdentityService,
AppListCloudPage, TaskListCloudComponentPage AppListCloudPage, TaskListCloudComponentPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksCloudDemoPage } from './pages/tasks-cloud-demo.page'; import { TasksCloudDemoPage } from './../pages/tasks-cloud-demo.page';
describe('Task filters cloud', () => { describe('Task filters cloud', () => {

View File

@@ -1,56 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { AboutPage, ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page';
describe('About Process Services', () => {
const loginPage = new LoginPage();
const navigationBarPage = new NavigationBarPage();
const aboutPage = new AboutPage();
let user;
const apiService = new ApiService();
const usersActions = new UsersActions(apiService);
beforeAll(async() => {
await apiService.loginWithProfile('admin');
user = await usersActions.createUser();
await apiService.login(user.username, user.password);
await loginPage.login(user.username, user.password);
await navigationBarPage.clickAboutButton();
});
afterAll(async() => {
await navigationBarPage.clickLogoutButton();
await apiService.loginWithProfile('admin');
await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
});
it('[C280002] Should be able to view about process services info', async () => {
await aboutPage.checkAppTitleIsDisplayed();
await aboutPage.checkSourceCodeTitleIsDisplayed();
await aboutPage.checkGithubUrlIsDisplayed();
await aboutPage.checkGithubVersionIsDisplayed();
await aboutPage.checkBpmHostIsDisplayed();
await aboutPage.checkBpmEditionIsDisplayed();
await aboutPage.checkBpmVersionIsDisplayed();
await aboutPage.checkAboutListIsLoaded();
await aboutPage.checkPackageColumnsIsDisplayed();
});
});

View File

@@ -17,10 +17,10 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ModelsActions } from '../actions/APS/models.actions'; import { ModelsActions } from '../../actions/APS/models.actions';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Modify applications', () => { describe('Modify applications', () => {

View File

@@ -30,10 +30,10 @@ import {
SearchService, SearchService,
Logger Logger
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Attach File - Content service', () => { describe('Attach File - Content service', () => {

View File

@@ -24,11 +24,11 @@ import {
ViewerPage, ViewerPage,
Widget Widget
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Start Task - Task App', () => { describe('Start Task - Task App', () => {
const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST; const app = browser.params.resources.Files.WIDGETS_SMOKE_TEST;

View File

@@ -29,10 +29,10 @@ import {
Widget, Widget,
SearchService SearchService
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Attach Folder', () => { describe('Attach Folder', () => {
const app = browser.params.resources.Files.WIDGET_CHECK_APP; const app = browser.params.resources.Files.WIDGET_CHECK_APP;

View File

@@ -17,12 +17,12 @@
import { ApiService, ApplicationsUtil, FormFields, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, FormFields, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { browser, by } from 'protractor'; import { browser, by } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { AttachFormPage } from './pages/attach-form.page'; import { AttachFormPage } from './../pages/attach-form.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { TaskDetailsPage } from './pages/task-details.page'; import { TaskDetailsPage } from './../pages/task-details.page';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Attach Form Component', () => { describe('Attach Form Component', () => {
const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM;

View File

@@ -16,15 +16,15 @@
*/ */
import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { ChecklistDialog } from './pages/dialog/create-checklist-dialog.page'; import { ChecklistDialog } from './../pages/dialog/create-checklist-dialog.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Checklist component', () => { describe('Checklist component', () => {

View File

@@ -24,9 +24,9 @@ import {
UsersActions, UsersActions,
Widget Widget
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Dynamic Table', () => { describe('Dynamic Table', () => {

View File

@@ -16,7 +16,7 @@
*/ */
import { ApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing'; import { ApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
describe('Form Component', () => { describe('Form Component', () => {

View File

@@ -23,12 +23,12 @@ import {
UsersActions, UsersActions,
Widget Widget
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { TaskDetailsPage } from './pages/task-details.page'; import { TaskDetailsPage } from './../pages/task-details.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
describe('Form widgets - People ', () => { describe('Form widgets - People ', () => {

View File

@@ -23,11 +23,11 @@ import {
UsersActions, UsersActions,
Widget Widget
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); import FormDefinitionModel = require('../../models/APS/FormDefinitionModel');
const formInstance = new FormDefinitionModel(); const formInstance = new FormDefinitionModel();

View File

@@ -16,14 +16,14 @@
*/ */
import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('People component', () => { describe('People component', () => {

View File

@@ -23,15 +23,15 @@ import {
UserModel, UserModel,
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { ProcessListDemoPage } from './pages/process-list-demo.page'; import { ProcessListDemoPage } from './../pages/process-list-demo.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { ProcessListPage } from './pages/process-list.page'; import { ProcessListPage } from './../pages/process-list.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Stencil', () => { describe('Stencil', () => {

View File

@@ -17,9 +17,9 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { CommentsPage } from '../core/pages/comments.page'; import { CommentsPage } from '../../core/pages/comments.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
describe('Comment component for Processes', () => { describe('Comment component for Processes', () => {

View File

@@ -18,9 +18,9 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { FiltersPage } from './pages/filters.page'; import { FiltersPage } from './../pages/filters.page';
describe('Sorting for process filters', () => { describe('Sorting for process filters', () => {

View File

@@ -16,10 +16,10 @@
*/ */
import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { AppSettingsTogglesPage } from './pages/dialog/app-settings-toggles.page'; import { AppSettingsTogglesPage } from './../pages/dialog/app-settings-toggles.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
describe('New Process Filters', () => { describe('New Process Filters', () => {

View File

@@ -17,11 +17,11 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ApiService, ApplicationsUtil, LoginPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, StartProcessPage, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { ProcessListPage } from './pages/process-list.page'; import { ProcessListPage } from './../pages/process-list.page';
describe('Empty Process List Test', () => { describe('Empty Process List Test', () => {

View File

@@ -24,9 +24,9 @@ import {
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
describe('Process List - Pagination when adding processes', () => { describe('Process List - Pagination when adding processes', () => {

View File

@@ -24,11 +24,11 @@ import {
UsersActions, UsersActions,
ViewerPage ViewerPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { AttachmentListPage } from './pages/attachment-list.page'; import { AttachmentListPage } from './../pages/attachment-list.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Attachment list action menu for processes', () => { describe('Attachment list action menu for processes', () => {

View File

@@ -23,16 +23,16 @@ import {
StartProcessPage, StartProcessPage,
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { ProcessListPage } from './pages/process-list.page'; import { ProcessListPage } from './../pages/process-list.page';
import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ProcessListDemoPage } from './pages/process-list-demo.page'; import { ProcessListDemoPage } from './../pages/process-list-demo.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Process Filters Test', () => { describe('Process Filters Test', () => {

View File

@@ -17,11 +17,11 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { ProcessListPage } from './pages/process-list.page'; import { ProcessListPage } from './../pages/process-list.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import moment = require('moment'); import moment = require('moment');
describe('Process Instance Details', () => { describe('Process Instance Details', () => {

View File

@@ -23,7 +23,7 @@ import {
ProcessUtil, ProcessUtil,
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessListDemoPage } from './pages/process-list-demo.page'; import { ProcessListDemoPage } from './../pages/process-list-demo.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
describe('Process List Test', () => { describe('Process List Test', () => {

View File

@@ -24,9 +24,9 @@ import {
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
describe('Process List - Pagination', () => { describe('Process List - Pagination', () => {

View File

@@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import { import {
ApiService, ApiService,
ApplicationsUtil, BrowserActions, ApplicationsUtil, BrowserActions,
@@ -31,15 +31,15 @@ import {
Widget Widget
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { AttachmentListPage } from './pages/attachment-list.page'; import { AttachmentListPage } from './../pages/attachment-list.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { ContentServicesPage } from '../core/pages/content-services.page'; import { ContentServicesPage } from '../../core/pages/content-services.page';
import { UploadDialogPage } from '../core/pages/dialog/upload-dialog.page'; import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
describe('Start Process Component', () => { describe('Start Process Component', () => {

View File

@@ -18,12 +18,12 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { CommentsPage } from '../core/pages/comments.page'; import { CommentsPage } from '../../core/pages/comments.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Comment component for Processes', () => { describe('Comment component for Processes', () => {

View File

@@ -26,9 +26,9 @@ import {
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { AppsRuntimeActions } from '../actions/APS/apps-runtime.actions'; import { AppsRuntimeActions } from '../../actions/APS/apps-runtime.actions';
import { TaskListDemoPage } from './pages/task-list-demo.page'; import { TaskListDemoPage } from './../pages/task-list-demo.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import moment = require('moment'); import moment = require('moment');

View File

@@ -28,12 +28,12 @@ import {
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { AppDefinitionRepresentation } from '@alfresco/js-api'; import { AppDefinitionRepresentation } from '@alfresco/js-api';
import { browser, by, element } from 'protractor'; import { browser, by, element } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { infoDrawerConfiguration } from './config/task.config'; import { infoDrawerConfiguration } from './../config/task.config';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import moment = require('moment'); import moment = require('moment');
describe('Info Drawer', () => { describe('Info Drawer', () => {

View File

@@ -24,9 +24,9 @@ import {
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Items per page set to 15 and adding of tasks', () => { describe('Items per page set to 15 and adding of tasks', () => {

View File

@@ -24,10 +24,10 @@ import {
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Task List Pagination - Sorting', () => { describe('Task List Pagination - Sorting', () => {

View File

@@ -18,12 +18,12 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import Task = require('../models/APS/Task'); import Task = require('../../models/APS/Task');
describe('Start Task - Task App', () => { describe('Start Task - Task App', () => {

View File

@@ -18,12 +18,12 @@
import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { browser, by } from 'protractor'; import { browser, by } from 'protractor';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { AttachmentListPage } from './pages/attachment-list.page'; import { AttachmentListPage } from './../pages/attachment-list.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Start Task - Custom App', () => { describe('Start Task - Custom App', () => {

View File

@@ -17,16 +17,16 @@
import { ApiService, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ApiService, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
import { browser, by } from 'protractor'; import { browser, by } from 'protractor';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { AttachmentListPage } from './pages/attachment-list.page'; import { AttachmentListPage } from './../pages/attachment-list.page';
import { ChecklistDialog } from './pages/dialog/create-checklist-dialog.page'; import { ChecklistDialog } from './../pages/dialog/create-checklist-dialog.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Start Task - Task App', () => { describe('Start Task - Task App', () => {

View File

@@ -24,15 +24,15 @@ import {
UserModel, UserModel,
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { ProcessFiltersPage } from './pages/process-filters.page'; import { ProcessFiltersPage } from './../pages/process-filters.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { ProcessDetailsPage } from './pages/process-details.page'; import { ProcessDetailsPage } from './../pages/process-details.page';
import { ProcessListPage } from './pages/process-list.page'; import { ProcessListPage } from './../pages/process-list.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Task Assignee', () => { describe('Task Assignee', () => {

View File

@@ -24,14 +24,14 @@ import {
UsersActions, UsersActions,
ViewerPage ViewerPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { AttachmentListPage } from './pages/attachment-list.page'; import { AttachmentListPage } from './../pages/attachment-list.page';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { FileModel } from '../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Attachment list action menu for tasks', () => { describe('Attachment list action menu for tasks', () => {

View File

@@ -16,9 +16,9 @@
*/ */
import { LoginPage, BrowserActions, FileBrowserUtil, ApplicationsUtil, ApiService, UsersActions } from '@alfresco/adf-testing'; import { LoginPage, BrowserActions, FileBrowserUtil, ApplicationsUtil, ApiService, UsersActions } from '@alfresco/adf-testing';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import { browser } from 'protractor'; import { browser } from 'protractor';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';

View File

@@ -25,15 +25,15 @@ import {
Widget Widget
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { FormModelActions } from '../actions/APS/form-model.actions'; import { FormModelActions } from '../../actions/APS/form-model.actions';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FiltersPage } from './pages/filters.page'; import { FiltersPage } from './../pages/filters.page';
import { TaskDetailsPage } from './pages/task-details.page'; import { TaskDetailsPage } from './../pages/task-details.page';
import { TasksListPage } from './pages/tasks-list.page'; import { TasksListPage } from './../pages/tasks-list.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { AttachFormPage } from './pages/attach-form.page'; import { AttachFormPage } from './../pages/attach-form.page';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Task Details - Form', () => { describe('Task Details - Form', () => {

View File

@@ -16,10 +16,10 @@
*/ */
import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, ProcessUtil, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Task Details - No form', () => { describe('Task Details - No form', () => {

View File

@@ -24,14 +24,14 @@ import {
StringUtil, StringUtil,
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { TaskRepresentation } from '@alfresco/js-api'; import { TaskRepresentation } from '@alfresco/js-api';
import Task = require('../models/APS/Task'); import Task = require('../../models/APS/Task');
import TaskModel = require('../models/APS/TaskModel'); import TaskModel = require('../../models/APS/TaskModel');
import FormModel = require('../models/APS/FormModel'); import FormModel = require('../../models/APS/FormModel');
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
import moment = require('moment'); import moment = require('moment');
describe('Task Details component', () => { describe('Task Details component', () => {

View File

@@ -16,14 +16,14 @@
*/ */
import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { TasksListPage } from './pages/tasks-list.page'; import { TasksListPage } from './../pages/tasks-list.page';
import { TaskDetailsPage } from './pages/task-details.page'; import { TaskDetailsPage } from './../pages/task-details.page';
import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page'; import { ProcessServiceTabBarPage } from './../pages/process-service-tab-bar.page';
import { AppSettingsTogglesPage } from './pages/dialog/app-settings-toggles.page'; import { AppSettingsTogglesPage } from './../pages/dialog/app-settings-toggles.page';
import { TaskFiltersDemoPage } from './pages/task-filters-demo.page'; import { TaskFiltersDemoPage } from './../pages/task-filters-demo.page';
import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api';
import { browser } from 'protractor'; import { browser } from 'protractor';

View File

@@ -16,12 +16,12 @@
*/ */
import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing'; import { ApiService, ApplicationsUtil, LoginPage, UsersActions } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { ProcessServicesPage } from './pages/process-services.page'; import { ProcessServicesPage } from './../pages/process-services.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import { TasksListPage } from './pages/tasks-list.page'; import { TasksListPage } from './../pages/tasks-list.page';
import { TaskDetailsPage } from './pages/task-details.page'; import { TaskDetailsPage } from './../pages/task-details.page';
import { TaskFiltersDemoPage } from './pages/task-filters-demo.page'; import { TaskFiltersDemoPage } from './../pages/task-filters-demo.page';
import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api'; import { UserProcessInstanceFilterRepresentation } from '@alfresco/js-api';
import { browser } from 'protractor'; import { browser } from 'protractor';

View File

@@ -25,9 +25,9 @@ import {
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { NavigationBarPage } from '../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { TasksPage } from './pages/tasks.page'; import { TasksPage } from './../pages/tasks.page';
import CONSTANTS = require('../util/constants'); import CONSTANTS = require('../../util/constants');
describe('Task List Pagination', () => { describe('Task List Pagination', () => {

View File

@@ -294,6 +294,24 @@ exports.config = {
} }
return retry.afterLaunch(MAX_RETRIES, statusCode); return retry.afterLaunch(MAX_RETRIES, statusCode);
},
onComplete: async function () {
browser.manage().logs().get('browser').then(function(browserLog) {
if (browserLog.length) {
browserLog = browserLog.filter((log)=>{
return log.level.name_ === 'SEVERE';
})
if (browserLog.length) {
console.error('\x1b[31m','============ Browser console error ===========');
browserLog.forEach((log)=>{
console.error('\x1b[31m', log.message);
})
}
}
});
} }
}; };

View File

@@ -1,13 +1,7 @@
{ {
"C277751": "setting problem APS not basic",
"C277752": "setting problem APS not basic",
"C277753": "setting problem APS not basic",
"C260049": "login problem APS not basic", "C260049": "login problem APS not basic",
"C260051": "login problem APS not basic", "C260051": "login problem APS not basic",
"C279932": "login problem APS not basic", "C279932": "login problem APS not basic",
"C279931": "login problem APS not basic", "C279931": "login problem APS not basic",
"C279930": "login problem APS not basic", "C279930": "login problem APS not basic"
"C260241": "ADF-5335- this will exclude 2 tests",
"C587515": "https://alfresco.atlassian.net/browse/ADF-5340",
"C311290": "https://alfresco.atlassian.net/browse/ADF-5308"
} }

View File

@@ -42,6 +42,8 @@ async function uploadScreenshot(retryCount, suffixFileName) {
}); });
} }
suffixFileName = suffixFileName.replace(/\//g, '-');
fs.renameSync(path.resolve(__dirname, '../../e2e-output/'), path.resolve(__dirname, `../../e2e-output-${retryCount}/`)) fs.renameSync(path.resolve(__dirname, '../../e2e-output/'), path.resolve(__dirname, `../../e2e-output-${retryCount}/`))
const child_process = require("child_process"); const child_process = require("child_process");

View File

@@ -113,7 +113,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
ngOnInit() { ngOnInit() {
this.cardViewUpdateService.itemUpdated$ this.cardViewUpdateService.itemUpdated$
.pipe( .pipe(
debounceTime(200), debounceTime(500),
takeUntil(this.onDestroy$)) takeUntil(this.onDestroy$))
.subscribe( .subscribe(
(updatedNode: UpdateNotification) => { (updatedNode: UpdateNotification) => {
@@ -124,7 +124,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
); );
this.cardViewUpdateService.updatedAspect$.pipe( this.cardViewUpdateService.updatedAspect$.pipe(
debounceTime(200), debounceTime(500),
takeUntil(this.onDestroy$)) takeUntil(this.onDestroy$))
.subscribe((node) => this.loadProperties(node)); .subscribe((node) => this.loadProperties(node));

View File

@@ -360,7 +360,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit, OnDestroy {
private onFileUploadEvent() { private onFileUploadEvent() {
this.uploadService.fileUploadComplete this.uploadService.fileUploadComplete
.pipe( .pipe(
debounceTime(300), debounceTime(500),
scan((files, currentFile) => [...files, currentFile], []), scan((files, currentFile) => [...files, currentFile], []),
takeUntil(this.onDestroy$) takeUntil(this.onDestroy$)
) )

View File

@@ -103,7 +103,7 @@ export class LibraryDialogComponent implements OnInit, OnDestroy {
this.form.controls['title'].valueChanges this.form.controls['title'].valueChanges
.pipe( .pipe(
debounceTime(300), debounceTime(500),
mergeMap( mergeMap(
(title) => this.checkLibraryNameExists(title), (title) => this.checkLibraryNameExists(title),
(title) => title (title) => title

View File

@@ -34,7 +34,7 @@ export class AlfrescoApiServiceMock extends AlfrescoApiService {
initialize(): Promise<any> { initialize(): Promise<any> {
return new Promise((resolve) => { return new Promise((resolve) => {
this.alfrescoApiInitializedSubject.next(true); this.alfrescoApiInitialized.next(true);
resolve(); resolve();
}); });
} }

View File

@@ -26,7 +26,7 @@ import {
AlfrescoApiCompatibility, AlfrescoApiConfig, AspectsApi, TypesApi AlfrescoApiCompatibility, AlfrescoApiConfig, AspectsApi, TypesApi
} from '@alfresco/js-api'; } from '@alfresco/js-api';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service'; import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import { Subject, Observable, BehaviorSubject } from 'rxjs'; import { Subject, ReplaySubject } from 'rxjs';
import { OauthConfigModel } from '../models/oauth-config.model'; import { OauthConfigModel } from '../models/oauth-config.model';
import { StorageService } from './storage.service'; import { StorageService } from './storage.service';
@@ -41,8 +41,7 @@ export class AlfrescoApiService {
*/ */
nodeUpdated = new Subject<Node>(); nodeUpdated = new Subject<Node>();
protected alfrescoApiInitializedSubject: BehaviorSubject<any>; alfrescoApiInitialized: ReplaySubject<boolean> = new ReplaySubject(1);
alfrescoApiInitialized: Observable<any>;
protected alfrescoApi: AlfrescoApiCompatibility; protected alfrescoApi: AlfrescoApiCompatibility;
@@ -113,15 +112,13 @@ export class AlfrescoApiService {
constructor( constructor(
protected appConfig: AppConfigService, protected appConfig: AppConfigService,
protected storageService: StorageService) { protected storageService: StorageService) {
this.alfrescoApiInitializedSubject = new BehaviorSubject(null);
this.alfrescoApiInitialized = this.alfrescoApiInitializedSubject.asObservable();
} }
async load() { async load() {
await this.appConfig.load().then(() => { await this.appConfig.load().then(() => {
this.storageService.prefix = this.appConfig.get<string>(AppConfigValues.STORAGE_PREFIX, ''); this.storageService.prefix = this.appConfig.get<string>(AppConfigValues.STORAGE_PREFIX, '');
this.initAlfrescoApi(); this.initAlfrescoApi();
this.alfrescoApiInitializedSubject.next(true); this.alfrescoApiInitialized.next(true);
}); });
} }

View File

@@ -16,7 +16,7 @@
*/ */
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable, Subject, from, throwError, Observer } from 'rxjs'; import { Observable, from, throwError, Observer, ReplaySubject } from 'rxjs';
import { AlfrescoApiService } from './alfresco-api.service'; import { AlfrescoApiService } from './alfresco-api.service';
import { CookieService } from './cookie.service'; import { CookieService } from './cookie.service';
import { LogService } from './log.service'; import { LogService } from './log.service';
@@ -39,8 +39,8 @@ export class AuthenticationService {
private bearerExcludedUrls: string[] = ['auth/realms', 'resources/', 'assets/']; private bearerExcludedUrls: string[] = ['auth/realms', 'resources/', 'assets/'];
onLogin: Subject<any> = new Subject<any>(); onLogin: ReplaySubject<any> = new ReplaySubject<any>(1);
onLogout: Subject<any> = new Subject<any>(); onLogout: ReplaySubject<any> = new ReplaySubject<any>(1);
constructor( constructor(
private appConfig: AppConfigService, private appConfig: AppConfigService,

View File

@@ -253,7 +253,7 @@ describe('EditProcessFilterCloudComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
component.editProcessFilterForm.valueChanges component.editProcessFilterForm.valueChanges
.pipe(debounceTime(300)) .pipe(debounceTime(500))
.subscribe(() => { .subscribe(() => {
const saveButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-filter-action-saveAs"]'); const saveButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-filter-action-saveAs"]');
fixture.detectChanges(); fixture.detectChanges();
@@ -277,7 +277,7 @@ describe('EditProcessFilterCloudComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
component.editProcessFilterForm.valueChanges component.editProcessFilterForm.valueChanges
.pipe(debounceTime(300)) .pipe(debounceTime(500))
.subscribe(() => { .subscribe(() => {
const saveButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-filter-action-saveAs"]'); const saveButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="adf-filter-action-saveAs"]');
fixture.detectChanges(); fixture.detectChanges();

View File

@@ -131,7 +131,7 @@ describe('StartProcessCloudComponent', () => {
const change = new SimpleChange(null, 'MyApp', true); const change = new SimpleChange(null, 'MyApp', true);
component.ngOnChanges({ 'appName': change }); component.ngOnChanges({ 'appName': change });
fixture.detectChanges(); fixture.detectChanges();
tick(450); tick(550);
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();
@@ -167,7 +167,7 @@ describe('StartProcessCloudComponent', () => {
typeValueInto('#processName', 'OLE'); typeValueInto('#processName', 'OLE');
typeValueInto('#processDefinitionName', 'processwithoutform2'); typeValueInto('#processDefinitionName', 'processwithoutform2');
fixture.detectChanges(); fixture.detectChanges();
tick(450); tick(550);
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();
@@ -244,7 +244,7 @@ describe('StartProcessCloudComponent', () => {
typeValueInto('#processName', 'My new process with form'); typeValueInto('#processName', 'My new process with form');
typeValueInto('#processDefinitionName', 'processwithform'); typeValueInto('#processDefinitionName', 'processwithform');
fixture.detectChanges(); fixture.detectChanges();
tick(450); tick(550);
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();
@@ -271,7 +271,7 @@ describe('StartProcessCloudComponent', () => {
typeValueInto('#processName', 'My new process with form'); typeValueInto('#processName', 'My new process with form');
typeValueInto('#processDefinitionName', 'processwithform'); typeValueInto('#processDefinitionName', 'processwithform');
fixture.detectChanges(); fixture.detectChanges();
tick(450); tick(550);
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();
@@ -299,7 +299,7 @@ describe('StartProcessCloudComponent', () => {
typeValueInto('#processName', 'My new process with form'); typeValueInto('#processName', 'My new process with form');
typeValueInto('#processDefinitionName', 'processwithform'); typeValueInto('#processDefinitionName', 'processwithform');
fixture.detectChanges(); fixture.detectChanges();
tick(450); tick(550);
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();
@@ -356,7 +356,7 @@ describe('StartProcessCloudComponent', () => {
const change = new SimpleChange(null, 'MyApp', true); const change = new SimpleChange(null, 'MyApp', true);
component.ngOnChanges({ 'appName': change }); component.ngOnChanges({ 'appName': change });
fixture.detectChanges(); fixture.detectChanges();
tick(450); tick(550);
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();
@@ -383,7 +383,7 @@ describe('StartProcessCloudComponent', () => {
const change = new SimpleChange(null, 'MyApp', true); const change = new SimpleChange(null, 'MyApp', true);
component.ngOnChanges({ 'appName': change }); component.ngOnChanges({ 'appName': change });
fixture.detectChanges(); fixture.detectChanges();
tick(450); tick(550);
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();

Some files were not shown because too many files have changed in this diff Show More