From b91a942aa1c027e9cb87a30c974844c2ca87e2e5 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Thu, 30 May 2019 11:15:15 +0100 Subject: [PATCH] Multiple option env file (#4788) * multi configuration file enabling * improve ignore * update i18n tool dep * update webbpack bundle analyzer version * fix ps cloud test wait setting * fix script content * remove use of testconfig for browser options * convert protractor to ts * download browser util fix --- .gitignore | 15 +- angular.json | 2 +- e2e/actions/ACS/upload.actions.ts | 4 +- e2e/actions/APS/apps.actions.ts | 5 +- e2e/actions/drop.actions.ts | 8 +- e2e/actions/users.actions.ts | 3 +- .../comments/comment-component.e2e.ts | 10 +- .../directives/create-folder-directive.e2e.ts | 5 +- .../create-library-directive.e2e.ts | 6 +- .../directives/download-directive.e2e.ts | 6 +- .../document-list-actions.e2e.ts | 5 +- .../document-list-component.e2e.ts | 30 +- .../document-list-copy-move.e2e.ts | 9 +- .../document-list-gallery.e2e.ts | 8 +- .../document-list-pagination.e2e.ts | 5 +- .../document-list-permissions.e2e.ts | 11 +- .../document-list-properties.e2e.ts | 8 +- .../document-list-thumbnails-tooltips.e2e.ts | 10 +- e2e/content-services/lock-file.e2e.ts | 6 +- .../metadata/aspect-oriented-config.e2e.ts | 6 +- .../metadata/metadata-permissions.e2e.ts | 6 +- .../metadata/metadata-properties.e2e.ts | 6 +- .../metadata/metadata-smoke-tests.e2e.ts | 10 +- .../notifications-component.e2e.ts | 5 +- .../permissions/permissions-component.e2e.ts | 7 +- .../permissions/site-permissions.e2e.ts | 9 +- .../share-file/share-file.e2e.ts | 8 +- .../share-file/unshare-file.e2e.ts | 7 +- .../sso-download-directive-component.e2e.ts | 17 +- e2e/content-services/tag-component.e2e.ts | 5 +- .../trashcan-pagination.e2e.ts | 5 +- .../tree-view-component.e2e.ts | 8 +- .../upload/cancel-upload.e2e.ts | 5 +- .../upload/excluded-file.e2e.ts | 5 +- .../upload/remove-upload.e2e.ts | 8 +- e2e/content-services/upload/upload-dialog.ts | 6 +- .../upload/uploader-component.e2e.ts | 5 +- .../upload/user-permission.e2e.ts | 5 +- .../version/version-actions.e2e.ts | 5 +- .../version/version-permissions.e2e.ts | 6 +- .../version/version-properties.e2e.ts | 7 +- .../version/version-smoke-tests.e2e.ts | 5 +- e2e/core/auth-guard/auth-guard-sso.e2e.ts | 11 +- e2e/core/card-view/card-view-component.e2e.ts | 5 +- .../data-table-component-selection.e2e.ts | 6 +- .../datatable/data-table-component.e2e.ts | 6 +- e2e/core/error-component.e2e.ts | 19 +- e2e/core/header-component.e2e.ts | 8 +- e2e/core/icons-component.e2e.ts | 6 +- e2e/core/infinite-scrolling.e2e.ts | 6 +- e2e/core/login/login-component.e2e.ts | 23 +- e2e/core/login/login-sso/login-sso.e2e.ts | 41 +- e2e/core/login/redirection.e2e.ts | 19 +- e2e/core/pagination-empty-current-page.e2e.ts | 6 +- e2e/core/settings-component.e2e.ts | 34 +- e2e/core/user-info-component-cloud.e2e.ts | 10 +- e2e/core/user-info-component.e2e.ts | 8 +- .../viewer-arcive.component.e2e.ts | 6 +- .../file-extensions/viewer-component.e2e.ts | 6 +- .../viewer-excel.component.e2e.ts | 6 +- .../viewer-image.component.e2e.ts | 6 +- .../viewer-powerpoint.component.e2e.ts | 6 +- .../viewer-text.component.e2e.ts | 6 +- .../viewer-word.component.e2e.ts | 6 +- e2e/core/viewer/info-drawer.component.e2e.ts | 6 +- .../viewer-content-services-component.e2e.ts | 6 +- .../viewer-custom-toolbar-info-drawer.e2e.ts | 6 +- e2e/core/viewer/viewer-extension.e2e.ts | 6 +- e2e/core/viewer/viewer-properties.e2e.ts | 6 +- e2e/core/viewer/viewer-share-content.ts | 14 +- e2e/insights/analytics-component.e2e.ts | 6 +- e2e/pages/adf/contentServicesPage.ts | 9 +- e2e/pages/adf/navigationBarPage.ts | 7 +- .../process-services/attachmentListPage.ts | 3 +- e2e/pages/adf/versionManagerPage.ts | 3 +- e2e/process-services/apps-section.e2e.ts | 5 +- .../attach-file-widget.e2e.ts | 12 +- .../attach-form-component.e2e.ts | 8 +- .../checklist-component.e2e.ts | 8 +- .../comment-component-processes.e2e.ts | 7 +- .../comment-component-tasks.e2e.ts | 7 +- .../custom-process-filters-sorting.e2e.ts | 7 +- .../custom-process-filters.e2e.ts | 8 +- .../custom-tasks-filters.e2e.ts | 6 +- .../dynamic-table-date-picker.e2e.ts | 8 +- .../empty-process-list-component.e2e.ts | 6 +- e2e/process-services/form-component.e2e.ts | 8 +- .../form-people-widget.e2e.ts | 7 +- .../form-widgets-component.e2e.ts | 16 +- ...ination-processlist-addingProcesses.e2e.ts | 5 +- .../pagination-tasklist-addingTasks.e2e.ts | 5 +- e2e/process-services/people-component.e2e.ts | 8 +- .../process-attachmentList-actionMenu.e2e.ts | 7 +- .../process-filters-component.e2e.ts | 7 +- .../process-instance-details.e2e.ts | 8 +- .../processList-component.e2e.ts | 10 +- .../processlist-pagination.e2e.ts | 8 +- .../sort-tasklist-pagination.e2e.ts | 6 +- e2e/process-services/standalone-task.e2e.ts | 7 +- .../start-process-component.e2e.ts | 7 +- .../start-task-custom-app.e2e.ts | 6 +- .../start-task-task-app.e2e.ts | 8 +- .../task-attachmentList-actionMenu.e2e.ts | 9 +- e2e/process-services/task-audit.e2e.ts | 8 +- e2e/process-services/task-details-form.e2e.ts | 6 +- .../task-details-no-form.e2e.ts | 6 +- e2e/process-services/task-details.e2e.ts | 8 +- .../task-filters-component.e2e.ts | 11 +- .../task-filters-sorting.e2e.ts | 5 +- .../task-list-pagination.e2e.ts | 6 +- .../widgets/amount-widget.e2e.ts | 10 +- .../widgets/attach-folder-widget.e2e.ts | 10 +- .../widgets/checkbox-widget.e2e.ts | 10 +- .../widgets/date-time-widget.e2e.ts | 10 +- .../widgets/date-widget.e2e.ts | 10 +- .../widgets/document-template-widget.e2e.ts | 10 +- .../widgets/dropdown-widget.e2e.ts | 10 +- .../widgets/dynamic-table-widget.e2e.ts | 18 +- .../widgets/header-widget.e2e.ts | 10 +- .../widgets/hyperlink-widget.e2e.ts | 10 +- .../widgets/multi-line-widget.e2e.ts | 10 +- .../widgets/number-widget.e2e.ts | 10 +- .../widgets/people-widget.e2e.ts | 10 +- .../widgets/radio-buttons-widget.e2e.ts | 10 +- .../widgets/text-widget.e2e.ts | 10 +- e2e/restAPI/ACS/PeopleAPI.js | 2 +- e2e/search/components/search-checkList.e2e.ts | 10 +- .../components/search-date-range.e2e.ts | 6 +- .../components/search-number-range.e2e.ts | 6 +- e2e/search/components/search-radio.e2e.ts | 10 +- e2e/search/components/search-slider.e2e.ts | 6 +- .../components/search-sorting-picker.e2e.ts | 8 +- e2e/search/components/search-text.e2e.ts | 10 +- e2e/search/search-component.e2e.ts | 7 +- e2e/search/search-filters.e2e.ts | 15 +- e2e/search/search-multiselect.e2e.ts | 9 +- e2e/search/search-page-component.e2e.ts | 7 +- e2e/test.config.js | 76 ++- lib/testing/README.md | 10 +- .../src/lib/core/pages/settings.page.ts | 13 +- .../src/lib/core/utils/file-browser.util.ts | 2 +- lib/testing/src/lib/test.configuration.ts | 13 + package-lock.json | 483 ++++++++++++++++++ package.json | 4 +- protractor.conf.js => protractor.conf.ts | 127 +++-- scripts/README.md | 2 +- scripts/{ => git-util}/affected-folder.sh | 0 .../{ => git-util}/check-branch-updated.sh | 0 scripts/test-e2e-lib.sh | 18 +- scripts/travis/e2e/content-services-e2e.sh | 6 +- scripts/travis/e2e/core-e2e.sh | 9 +- scripts/travis/e2e/insights-e2e.sh | 3 +- .../travis/e2e/process-services-cloud-e2e.sh | 6 +- scripts/travis/e2e/process-services-e2e.sh | 8 +- scripts/travis/e2e/search-e2e.sh | 6 +- tools/i18n/li18nt/client/package.json | 4 +- 156 files changed, 1227 insertions(+), 715 deletions(-) rename protractor.conf.js => protractor.conf.ts (80%) rename scripts/{ => git-util}/affected-folder.sh (100%) rename scripts/{ => git-util}/check-branch-updated.sh (100%) diff --git a/.gitignore b/.gitignore index 1dde918019..85b3beeed0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,24 +3,13 @@ node_modules bundles workspace.xml .idea/ -.env.cloud +.env.* dist/ e2e/.env.cloud tmp e2e-output/ -e2e/downloads/ -ng2-components/coverage/ -!systemjs.config.js -demo-shell-ng2/app/components/router/ -ng2-components/ng2-alfresco-userinfo-old/demo/src/app/ -ng2-components/ng2-alfresco-userinfo-old/src/services/bpm-user.service.spec.ts -ng2-components/ng2-alfresco-userinfo-old/src/services/ecm-user.service.spec.ts -src/environments/ -/ng2-components/ng2-example-webpack/ -/ng2-components/config/coverage/ +/e2e/downloads/ *.npmrc -/demo-shell-ng2/ng2-components/ -.happypack/ .history /ng2-components/ng2-alfresco-core/prebuilt-themes/ .ng_pkg_build/ diff --git a/angular.json b/angular.json index ec1106f1f1..38fabb96b6 100644 --- a/angular.json +++ b/angular.json @@ -516,7 +516,7 @@ "e2e": { "builder": "@angular-devkit/build-angular:protractor", "options": { - "protractorConfig": "./protractor.conf.js", + "protractorConfig": "./protractor.conf.ts", "devServerTarget": "lib-e2e-test:serve" } }, diff --git a/e2e/actions/ACS/upload.actions.ts b/e2e/actions/ACS/upload.actions.ts index ae6495f050..7e6ca2f25d 100644 --- a/e2e/actions/ACS/upload.actions.ts +++ b/e2e/actions/ACS/upload.actions.ts @@ -17,12 +17,12 @@ import path = require('path'); import fs = require('fs'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; export class UploadActions { async uploadFile(alfrescoJsApi, fileLocation, fileName, parentFolderId) { - const pathFile = path.join(TestConfig.main.rootPath + fileLocation); + const pathFile = path.join(browser.params.testConfig.main.rootPath + fileLocation); const file = fs.createReadStream(pathFile); return alfrescoJsApi.upload.uploadFile( diff --git a/e2e/actions/APS/apps.actions.ts b/e2e/actions/APS/apps.actions.ts index c80c731280..5e30428dc4 100644 --- a/e2e/actions/APS/apps.actions.ts +++ b/e2e/actions/APS/apps.actions.ts @@ -17,7 +17,6 @@ import path = require('path'); import fs = require('fs'); -import TestConfig = require('../../test.config'); import AppPublish = require('../../models/APS/AppPublish'); import remote = require('selenium-webdriver/remote'); import { browser } from 'protractor'; @@ -63,7 +62,7 @@ export class AppsActions { async importApp(alfrescoJsApi, appFileLocation) { browser.setFileDetector(new remote.FileDetector()); - const pathFile = path.join(TestConfig.main.rootPath + appFileLocation); + const pathFile = path.join(browser.params.testConfig.main.rootPath + appFileLocation); const file = fs.createReadStream(pathFile); return await alfrescoJsApi.activiti.appsApi.importAppDefinition(file); @@ -82,7 +81,7 @@ export class AppsActions { async importNewVersionAppDefinitionPublishDeployApp(alfrescoJsApi, appFileLocation, modelId) { browser.setFileDetector(new remote.FileDetector()); - const pathFile = path.join(TestConfig.main.rootPath + appFileLocation); + const pathFile = path.join(browser.params.testConfig.main.rootPath + appFileLocation); const file = fs.createReadStream(pathFile); const appCreated = await alfrescoJsApi.activiti.appsApi.importNewAppDefinition(modelId, file); diff --git a/e2e/actions/drop.actions.ts b/e2e/actions/drop.actions.ts index c1732346a3..ceb0a43f2f 100644 --- a/e2e/actions/drop.actions.ts +++ b/e2e/actions/drop.actions.ts @@ -15,11 +15,9 @@ * limitations under the License. */ -import { browser } from 'protractor'; - import fs = require('fs'); import path = require('path'); -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import remote = require('selenium-webdriver/remote'); const JS_BIND_INPUT = function (target) { @@ -81,7 +79,7 @@ export class DropActions { dropFile(dropArea, filePath) { browser.setFileDetector(new remote.FileDetector()); - const absolutePath = path.resolve(path.join(TestConfig.main.rootPath, filePath)); + const absolutePath = path.resolve(path.join(browser.params.testConfig.main.rootPath, filePath)); fs.accessSync(absolutePath, fs.constants.F_OK); return dropArea.getWebElement().then((element) => { @@ -95,7 +93,7 @@ export class DropActions { dropFolder(dropArea, folderPath) { browser.setFileDetector(new remote.FileDetector()); - const absolutePath = path.resolve(path.join(TestConfig.main.rootPath, folderPath)); + const absolutePath = path.resolve(path.join(browser.params.testConfig.main.rootPath, folderPath)); fs.accessSync(absolutePath, fs.constants.F_OK); return dropArea.getWebElement().then((element) => { diff --git a/e2e/actions/users.actions.ts b/e2e/actions/users.actions.ts index 1fd0be5fbf..85cd0052f8 100644 --- a/e2e/actions/users.actions.ts +++ b/e2e/actions/users.actions.ts @@ -17,7 +17,6 @@ import { Tenant } from '../models/APS/tenant'; import { User } from '../models/APS/user'; -import TestConfig = require('../test.config'); import path = require('path'); import fs = require('fs'); import remote = require('selenium-webdriver/remote'); @@ -69,7 +68,7 @@ export class UsersActions { async changeProfilePictureAps(alfrescoJsApi, fileLocation) { browser.setFileDetector(new remote.FileDetector()); - const pathFile = path.join(TestConfig.main.rootPath + fileLocation); + const pathFile = path.join(browser.params.testConfig.main.rootPath + fileLocation); const file = fs.createReadStream(pathFile); return alfrescoJsApi.activiti.profileApi.uploadProfilePicture(file); diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index ed2464750e..18ea13ce28 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -24,7 +24,7 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import CONSTANTS = require('../../util/constants'); import { StringUtil } from '@alfresco/adf-testing'; @@ -66,10 +66,10 @@ describe('Comment Component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); done(); @@ -95,7 +95,7 @@ describe('Comment Component', () => { afterEach(async (done) => { try { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, nodeId); } catch (error) { @@ -181,7 +181,7 @@ describe('Comment Component', () => { let site, pngUploadedFile; beforeAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); site = await this.alfrescoJsApi.core.sitesApi.createSite({ title: StringUtil.generateRandomString(8), diff --git a/e2e/content-services/directives/create-folder-directive.e2e.ts b/e2e/content-services/directives/create-folder-directive.e2e.ts index 146641e0c7..b28dc93e64 100644 --- a/e2e/content-services/directives/create-folder-directive.e2e.ts +++ b/e2e/content-services/directives/create-folder-directive.e2e.ts @@ -22,7 +22,6 @@ import { NotificationPage } from '../../pages/adf/notificationPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser, Key } from 'protractor'; @@ -39,10 +38,10 @@ describe('Create folder directive', function () { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/directives/create-library-directive.e2e.ts b/e2e/content-services/directives/create-library-directive.e2e.ts index c570a2bc33..dccc37f19c 100644 --- a/e2e/content-services/directives/create-library-directive.e2e.ts +++ b/e2e/content-services/directives/create-library-directive.e2e.ts @@ -21,7 +21,7 @@ import { CreateLibraryDialog } from '../../pages/adf/dialog/createLibraryDialog' import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { StringUtil } from '@alfresco/adf-testing'; @@ -45,10 +45,10 @@ describe('Create library directive', function () { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/directives/download-directive.e2e.ts b/e2e/content-services/directives/download-directive.e2e.ts index b0f597b962..0ea56b5e72 100644 --- a/e2e/content-services/directives/download-directive.e2e.ts +++ b/e2e/content-services/directives/download-directive.e2e.ts @@ -20,7 +20,7 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { LoginPage, FileBrowserUtil, BrowserVisibility } from '@alfresco/adf-testing'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -68,10 +68,10 @@ describe('Version component actions', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); diff --git a/e2e/content-services/document-list/document-list-actions.e2e.ts b/e2e/content-services/document-list/document-list-actions.e2e.ts index 4ef3596d34..02668b400b 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -20,7 +20,6 @@ import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; @@ -40,7 +39,7 @@ describe('Document List Component - Actions', () => { const alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); describe('Document List Component - Check Actions', () => { @@ -69,7 +68,7 @@ describe('Document List Component - Actions', () => { beforeAll(async (done) => { acsUser = new AcsUserModel(); folderName = `TATSUMAKY_${StringUtil.generateRandomString(5)}_SENPOUKYAKU`; - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.core.peopleApi.addPerson(acsUser); await alfrescoJsApi.login(acsUser.id, acsUser.password); pdfUploadedNode = await uploadActions.uploadFile(alfrescoJsApi, pdfFileModel.location, pdfFileModel.name, '-my-'); diff --git a/e2e/content-services/document-list/document-list-component.e2e.ts b/e2e/content-services/document-list/document-list-component.e2e.ts index a92f6ec240..fa1cb77011 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -18,7 +18,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { ViewerPage } from '../../pages/adf/viewerPage'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { LoginPage, StringUtil } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -38,12 +38,12 @@ describe('Document List Component', () => { beforeAll(() => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); }); afterEach(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); if (uploadedFolder) { await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, uploadedFolder.entry.id); uploadedFolder = null; @@ -92,7 +92,7 @@ describe('Document List Component', () => { /* cspell:disable-next-line */ folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -104,7 +104,7 @@ describe('Document List Component', () => { }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); if (pdfUploadedNode) { await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pdfUploadedNode.entry.id); @@ -186,7 +186,7 @@ describe('Document List Component', () => { const user = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(user); @@ -202,7 +202,7 @@ describe('Document List Component', () => { }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); if (fileANode) { await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, fileANode.entry.id); } @@ -242,7 +242,7 @@ describe('Document List Component', () => { xit('[C260121] Should show the spinner on content loading', async (done) => { acsUser = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); loginPage.loginToContentServicesUsingUserModel(acsUser); contentServicesPage.clickOnContentServices(); @@ -254,7 +254,7 @@ describe('Document List Component', () => { acsUser = new AcsUserModel(); const folderName = 'BANANA'; - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await loginPage.loginToContentServicesUsingUserModel(acsUser); contentServicesPage.goToDocumentList(); @@ -273,7 +273,7 @@ describe('Document List Component', () => { acsUser = new AcsUserModel(); /* cspell:disable-next-line */ const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); uploadedFolder = await uploadActions.createFolder(this.alfrescoJsApi, folderName, '-my-'); @@ -288,7 +288,7 @@ describe('Document List Component', () => { it('[C261997] Should be able to clean Recent Files history', async (done) => { acsUser = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await loginPage.loginToContentServicesUsingUserModel(acsUser); contentServicesPage.clickOnContentServices(); @@ -305,7 +305,7 @@ describe('Document List Component', () => { acsUser = new AcsUserModel(); const folderNameA = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; const folderNameB = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`; - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); uploadedFolder = await uploadActions.createFolder(this.alfrescoJsApi, folderNameA, '-my-'); @@ -329,7 +329,7 @@ describe('Document List Component', () => { 'location': resources.Files.ADF_DOCUMENTS.PDF_B.file_location }); acsUser = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); testFileNode = await uploadActions.uploadFile(this.alfrescoJsApi, testFileA.location, testFileA.name, '-my-'); @@ -350,7 +350,7 @@ describe('Document List Component', () => { beforeAll(async (done) => { acsUser = new AcsUserModel(); folderCreated = []; - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); let folderName = ''; @@ -392,7 +392,7 @@ describe('Document List Component', () => { beforeAll(async (done) => { acsUser = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); file = await uploadActions.uploadFile(this.alfrescoJsApi, file0BytesModel.location, file0BytesModel.name, '-my-'); diff --git a/e2e/content-services/document-list/document-list-copy-move.e2e.ts b/e2e/content-services/document-list/document-list-copy-move.e2e.ts index 6ed870637f..393ae01a56 100644 --- a/e2e/content-services/document-list/document-list-copy-move.e2e.ts +++ b/e2e/content-services/document-list/document-list-copy-move.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { by, element } from 'protractor'; +import { by, element, browser } from 'protractor'; import { LoginPage, PaginationPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { StringUtil } from '@alfresco/adf-testing'; @@ -43,7 +42,7 @@ describe('Document List Component - Actions', () => { const alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); describe('Folder Actions - Copy and Move', () => { @@ -62,7 +61,7 @@ describe('Document List Component - Actions', () => { beforeAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.core.peopleApi.addPerson(contentServicesUser); await alfrescoJsApi.login(contentServicesUser.id, contentServicesUser.password); folder1 = await uploadActions.createFolder(alfrescoJsApi, 'A' + folderModel1.name, '-my-'); @@ -84,7 +83,7 @@ describe('Document List Component - Actions', () => { }); afterAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await folders.forEach(function (folder) { uploadActions.deleteFilesOrFolder(alfrescoJsApi, folder.entry.id); }); diff --git a/e2e/content-services/document-list/document-list-gallery.e2e.ts b/e2e/content-services/document-list/document-list-gallery.e2e.ts index dcffafa6c9..78bff62914 100644 --- a/e2e/content-services/document-list/document-list-gallery.e2e.ts +++ b/e2e/content-services/document-list/document-list-gallery.e2e.ts @@ -17,7 +17,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { LoginPage, StringUtil } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -36,7 +36,7 @@ describe('Document List Component', () => { beforeAll(() => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); }); @@ -71,7 +71,7 @@ describe('Document List Component', () => { beforeAll(async (done) => { acsUser = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); funnyUser = await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); filePdfNode = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFile.location, pdfFile.name, '-my-'); @@ -172,7 +172,7 @@ describe('Document List Component', () => { }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); if (filePdfNode) { await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, filePdfNode.entry.id); } diff --git a/e2e/content-services/document-list/document-list-pagination.e2e.ts b/e2e/content-services/document-list/document-list-pagination.e2e.ts index ecc91fbf34..fcad7be4ec 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/e2e/content-services/document-list/document-list-pagination.e2e.ts @@ -22,7 +22,6 @@ import { PaginationPage } from '@alfresco/adf-testing'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FolderModel } from '../../models/ACS/folderModel'; -import TestConfig = require('../../test.config'); import { Util } from '../../util/util'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -70,10 +69,10 @@ describe('Document List - Pagination', function () { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/document-list/document-list-permissions.e2e.ts b/e2e/content-services/document-list/document-list-permissions.e2e.ts index ff074e5c06..e7889aa9d5 100644 --- a/e2e/content-services/document-list/document-list-permissions.e2e.ts +++ b/e2e/content-services/document-list/document-list-permissions.e2e.ts @@ -19,7 +19,6 @@ import { browser } from 'protractor'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); import { LoginPage, ErrorPage, StringUtil, BrowserActions } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -35,7 +34,7 @@ describe('Document List Component', () => { beforeAll(() => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); }); @@ -46,7 +45,7 @@ describe('Document List Component', () => { const siteName = `PRIVATE_TEST_SITE_${StringUtil.generateRandomString(5)}`; const privateSiteBody = { visibility: 'PRIVATE', title: siteName }; - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -65,7 +64,7 @@ describe('Document List Component', () => { }); it('[C217334] Should display a message when accessing file without permissions', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/files/' + privateSite.entry.guid); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid); expect(errorPage.getErrorCode()).toBe('403'); expect(errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.'); }); @@ -73,7 +72,7 @@ describe('Document List Component', () => { it('[C279924] Should display custom message when accessing a file without permissions', () => { contentServicesPage.goToDocumentList(); contentServicesPage.enableCustomPermissionMessage(); - BrowserActions.getUrl(TestConfig.adf.url + '/files/' + privateSite.entry.guid); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid); expect(errorPage.getErrorCode()).toBe('403'); }); @@ -81,7 +80,7 @@ describe('Document List Component', () => { navBar.openLanguageMenu(); navBar.chooseLanguage('Italiano'); browser.sleep(2000); - BrowserActions.getUrl(TestConfig.adf.url + '/files/' + privateSite.entry.guid); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + privateSite.entry.guid); expect(errorPage.getErrorDescription()).toBe('Accesso alla risorsa sul server non consentito.'); }); diff --git a/e2e/content-services/document-list/document-list-properties.e2e.ts b/e2e/content-services/document-list/document-list-properties.e2e.ts index 35c82e739d..77af75232c 100644 --- a/e2e/content-services/document-list/document-list-properties.e2e.ts +++ b/e2e/content-services/document-list/document-list-properties.e2e.ts @@ -20,7 +20,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -46,7 +46,7 @@ describe('Document List Component - Properties', () => { beforeAll(() => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); }); @@ -55,7 +55,7 @@ describe('Document List Component - Properties', () => { beforeEach(async (done) => { acsUser = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -71,7 +71,7 @@ describe('Document List Component - Properties', () => { }); afterEach(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, subFolder.entry.id); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, parentFolder.entry.id); done(); diff --git a/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts b/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts index 71324c3317..efdeef6f6c 100644 --- a/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts +++ b/e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts @@ -17,7 +17,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { LoginPage, StringUtil } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -36,12 +36,12 @@ describe('Document List Component', () => { beforeAll(() => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); }); afterEach(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); if (uploadedFolder) { await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, uploadedFolder.entry.id); uploadedFolder = null; @@ -82,7 +82,7 @@ describe('Document List Component', () => { beforeAll(async (done) => { acsUser = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -96,7 +96,7 @@ describe('Document List Component', () => { }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); if (filePdfNode) { await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, filePdfNode.entry.id); } diff --git a/e2e/content-services/lock-file.e2e.ts b/e2e/content-services/lock-file.e2e.ts index 902a0892c4..2b57094703 100644 --- a/e2e/content-services/lock-file.e2e.ts +++ b/e2e/content-services/lock-file.e2e.ts @@ -27,7 +27,7 @@ import { FileModel } from '../models/ACS/fileModel'; import CONSTANTS = require('../util/constants'); import { StringUtil } from '@alfresco/adf-testing'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -59,10 +59,10 @@ describe('Lock File', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(adminUser); await this.alfrescoJsApi.core.peopleApi.addPerson(managerUser); diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index 00ee59229e..6f1a6bdd4d 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -23,7 +23,7 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -53,10 +53,10 @@ describe('Aspect oriented config', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); try { await this.alfrescoJsApi.core.customModelApi.createCustomModel('ACTIVE', modelOneName, modelOneName, modelOneName, modelOneName); diff --git a/e2e/content-services/metadata/metadata-permissions.e2e.ts b/e2e/content-services/metadata/metadata-permissions.e2e.ts index 1406432807..1e3170bfb2 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -23,7 +23,7 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -68,10 +68,10 @@ describe('permissions', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(consumerUser); await this.alfrescoJsApi.core.peopleApi.addPerson(collaboratorUser); diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index b814119be3..0a36b1699b 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -22,7 +22,7 @@ import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -65,10 +65,10 @@ describe('CardView Component - properties', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index f067af3871..03cf0e04a0 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -23,7 +23,7 @@ import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import dateFormat = require('dateformat'); @@ -67,10 +67,10 @@ describe('Metadata component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -294,9 +294,9 @@ describe('Metadata component', () => { }); it('[C279960] Should show the last username modifier when modify a File', async () => { - await loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await loginPage.loginToContentServices(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); - BrowserActions.getUrl(TestConfig.adf.url + `/(overlay:files/${pngFileModel.id}/view)`); + BrowserActions.getUrl(browser.params.testConfig.adf.url + `/(overlay:files/${pngFileModel.id}/view)`); viewerPage.clickInfoButton(); viewerPage.checkInfoSideBarIsDisplayed(); diff --git a/e2e/content-services/notifications-component.e2e.ts b/e2e/content-services/notifications-component.e2e.ts index c02f73da4e..ed969ce8fb 100644 --- a/e2e/content-services/notifications-component.e2e.ts +++ b/e2e/content-services/notifications-component.e2e.ts @@ -17,7 +17,6 @@ import { LoginPage } from '@alfresco/adf-testing'; import { AcsUserModel } from '../models/ACS/acsUserModel'; -import TestConfig = require('../test.config'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NotificationPage } from '../pages/adf/notificationPage'; import { browser } from 'protractor'; @@ -33,10 +32,10 @@ describe('Notifications Component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index 08d368aa96..4afc372d20 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/e2e/content-services/permissions/permissions-component.e2e.ts @@ -19,7 +19,6 @@ import { PermissionsPage } from '../../pages/adf/permissionsPage'; import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; @@ -70,7 +69,7 @@ describe('Permissions Component', function () { const alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); const roleConsumerFolderModel = new FolderModel({ 'name': 'roleConsumer' + StringUtil.generateRandomString() }); @@ -89,7 +88,7 @@ describe('Permissions Component', function () { beforeAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.core.peopleApi.addPerson(fileOwnerUser); await alfrescoJsApi.core.peopleApi.addPerson(filePermissionUser); @@ -173,7 +172,7 @@ describe('Permissions Component', function () { }); afterAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await folders.forEach(function (folder) { uploadActions.deleteFilesOrFolder(alfrescoJsApi, folder.entry.id); }); diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index deaff81e2a..3f8c375f20 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -19,7 +19,6 @@ import { PermissionsPage } from '../../pages/adf/permissionsPage'; import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; @@ -69,7 +68,7 @@ describe('Permissions Component', function () { const alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); let siteFolder, privateSiteFile; @@ -83,7 +82,7 @@ describe('Permissions Component', function () { beforeAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.core.peopleApi.addPerson(folderOwnerUser); await alfrescoJsApi.core.peopleApi.addPerson(siteConsumerUser); @@ -153,7 +152,7 @@ describe('Permissions Component', function () { }); afterAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.core.sitesApi.deleteSite(publicSite.entry.id); await alfrescoJsApi.core.sitesApi.deleteSite(privateSite.entry.id); @@ -165,7 +164,7 @@ describe('Permissions Component', function () { beforeAll(async (done) => { await loginPage.loginToContentServicesUsingUserModel(folderOwnerUser); - await BrowserActions.getUrl(TestConfig.adf.url + '/files/' + publicSite.entry.guid); + await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + publicSite.entry.guid); done(); }); diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index 7327375393..c96b64bcac 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -24,7 +24,7 @@ import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -52,10 +52,10 @@ describe('Share file', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); @@ -74,7 +74,7 @@ describe('Share file', () => { afterAll(async (done) => { try { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, nodeId); } catch (error) { } diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index 54b776f8d9..5d056ab81c 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -23,7 +23,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; @@ -71,10 +70,10 @@ describe('Unshare file', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); testSite = await this.alfrescoJsApi.core.sitesApi.createSite(site); @@ -160,7 +159,7 @@ describe('Unshare file', () => { describe('without permission', () => { afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.sitesApi.deleteSite(siteName, { permanent: true }); done(); }); diff --git a/e2e/content-services/sso/sso-download-directive-component.e2e.ts b/e2e/content-services/sso/sso-download-directive-component.e2e.ts index 44d81e4e9a..2463404607 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -16,7 +16,6 @@ */ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import TestConfig = require('../../test.config'); import { browser } from 'protractor'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ApiService, LoginSSOPage } from '@alfresco/adf-testing'; @@ -54,10 +53,10 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url, + hostEcm: browser.params.testConfig.adf.url, authType: 'OAUTH', oauth2: { - host: TestConfig.adf.hostSso, + host: browser.params.testConfig.adf.hostSso, clientId: 'alfresco', scope: 'openid', secret: '', @@ -77,8 +76,8 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList describe('SSO in ADF using ACS and AIS, implicit flow set', () => { beforeAll(async (done) => { - const apiService = new ApiService('alfresco', TestConfig.adf.url, TestConfig.adf.hostSso, 'ECM'); - await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + const apiService = new ApiService('alfresco', browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM'); + await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); identityService = new IdentityService(apiService); @@ -93,7 +92,11 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList silentLogin = false; implicitFlow = true; - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco'); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, + silentLogin, implicitFlow, 'alfresco'); + loginSsoPage.clickOnSSOButton(); loginSsoPage.loginSSOIdentityService(acsUser.id, acsUser.password); @@ -106,7 +109,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList afterAll(async (done) => { try { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, folder.entry.id); await identityService.deleteIdentityUser(acsUser.id); } catch (error) { diff --git a/e2e/content-services/tag-component.e2e.ts b/e2e/content-services/tag-component.e2e.ts index 27b77a9816..46d3c55263 100644 --- a/e2e/content-services/tag-component.e2e.ts +++ b/e2e/content-services/tag-component.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TagPage } from '../pages/adf/tagPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -65,10 +64,10 @@ xdescribe('Tag component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index cf33b49c4b..5d34acc019 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/e2e/content-services/trashcan-pagination.e2e.ts @@ -24,7 +24,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; -import TestConfig = require('../test.config'); import { Util } from '../util/util'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -65,10 +64,10 @@ describe('Trashcan - Pagination', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/tree-view-component.e2e.ts b/e2e/content-services/tree-view-component.e2e.ts index 007e74b344..47ace31a71 100644 --- a/e2e/content-services/tree-view-component.e2e.ts +++ b/e2e/content-services/tree-view-component.e2e.ts @@ -21,7 +21,7 @@ import { TreeViewPage } from '../pages/adf/content-services/treeViewPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../actions/ACS/upload.actions'; @@ -49,10 +49,10 @@ describe('Tree View Component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -84,7 +84,7 @@ describe('Tree View Component', () => { afterAll(async (done) => { try { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, treeFolder.entry.id); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, secondTreeFolder.entry.id); diff --git a/e2e/content-services/upload/cancel-upload.e2e.ts b/e2e/content-services/upload/cancel-upload.e2e.ts index c79ee6974a..b7d88d1a9a 100644 --- a/e2e/content-services/upload/cancel-upload.e2e.ts +++ b/e2e/content-services/upload/cancel-upload.e2e.ts @@ -25,7 +25,6 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -56,10 +55,10 @@ describe('Upload component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index e40e80cff1..04056720aa 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -26,7 +26,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { FolderModel } from '../../models/ACS/folderModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -63,10 +62,10 @@ describe('Upload component - Excluded Files', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/upload/remove-upload.e2e.ts b/e2e/content-services/upload/remove-upload.e2e.ts index 4b9d490721..83adaa61bb 100644 --- a/e2e/content-services/upload/remove-upload.e2e.ts +++ b/e2e/content-services/upload/remove-upload.e2e.ts @@ -23,7 +23,7 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -48,12 +48,12 @@ describe('Upload component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); await this.alfrescoJsApi.login( - TestConfig.adf.adminEmail, - TestConfig.adf.adminPassword + browser.params.testConfig.adf.adminEmail, + browser.params.testConfig.adf.adminPassword ); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/upload/upload-dialog.ts b/e2e/content-services/upload/upload-dialog.ts index 30a69dbd93..8c3fd0d0e3 100644 --- a/e2e/content-services/upload/upload-dialog.ts +++ b/e2e/content-services/upload/upload-dialog.ts @@ -23,7 +23,7 @@ import { UploadToggles } from '../../pages/adf/dialog/uploadToggles'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -64,10 +64,10 @@ describe('Upload component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index d18885a623..1acb4a893d 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -26,7 +26,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { FolderModel } from '../../models/ACS/folderModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { StringUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -83,10 +82,10 @@ describe('Upload component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index dd00701ad1..62a9f11f2f 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/e2e/content-services/upload/user-permission.e2e.ts @@ -30,7 +30,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; import { FolderModel } from '../../models/ACS/folderModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -71,7 +70,7 @@ describe('Upload - User permission', () => { beforeAll(() => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); }); @@ -79,7 +78,7 @@ describe('Upload - User permission', () => { acsUser = new AcsUserModel(); acsUserTwo = new AcsUserModel(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index 260d50c0f6..d8cee32f94 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -24,7 +24,6 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -65,10 +64,10 @@ describe('Version component actions', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/version/version-permissions.e2e.ts b/e2e/content-services/version/version-permissions.e2e.ts index eafb236eff..1fb2c7c0e2 100644 --- a/e2e/content-services/version/version-permissions.e2e.ts +++ b/e2e/content-services/version/version-permissions.e2e.ts @@ -27,7 +27,7 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -76,10 +76,10 @@ describe('Version component permissions', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.core.peopleApi.addPerson(consumerUser); diff --git a/e2e/content-services/version/version-properties.e2e.ts b/e2e/content-services/version/version-properties.e2e.ts index 9c493df523..d014409896 100644 --- a/e2e/content-services/version/version-properties.e2e.ts +++ b/e2e/content-services/version/version-properties.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { by, element } from 'protractor'; +import { by, element, browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; @@ -24,7 +24,6 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -57,10 +56,10 @@ describe('Version Properties', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/content-services/version/version-smoke-tests.e2e.ts b/e2e/content-services/version/version-smoke-tests.e2e.ts index 2d665b7c15..765c638b90 100644 --- a/e2e/content-services/version/version-smoke-tests.e2e.ts +++ b/e2e/content-services/version/version-smoke-tests.e2e.ts @@ -24,7 +24,6 @@ import { VersionManagePage } from '../../pages/adf/versionManagerPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -73,10 +72,10 @@ describe('Version component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/core/auth-guard/auth-guard-sso.e2e.ts b/e2e/core/auth-guard/auth-guard-sso.e2e.ts index e252a39a9d..7118681d1a 100644 --- a/e2e/core/auth-guard/auth-guard-sso.e2e.ts +++ b/e2e/core/auth-guard/auth-guard-sso.e2e.ts @@ -16,7 +16,6 @@ */ import { ErrorPage, LoginSSOPage, SettingsPage, BrowserActions } from '@alfresco/adf-testing'; -import TestConfig = require('../../test.config'); import { browser } from 'protractor'; describe('Auth Guard SSO', () => { @@ -26,10 +25,14 @@ describe('Auth Guard SSO', () => { const errorPage = new ErrorPage(); it('[C307058] Should be redirected to 403 when user doesn\'t have permissions', async () => { - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false, true, 'alfresco'); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, + false, true, 'alfresco'); + loginSSOPage.clickOnSSOButton(); - await loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); - BrowserActions.getUrl(TestConfig.adf.url + '/cloud/simple-app'); + await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/cloud/simple-app'); browser.driver.sleep(1000); expect(errorPage.getErrorCode()).toBe('403'); }); diff --git a/e2e/core/card-view/card-view-component.e2e.ts b/e2e/core/card-view/card-view-component.e2e.ts index 198e40156e..20d31f4867 100644 --- a/e2e/core/card-view/card-view-component.e2e.ts +++ b/e2e/core/card-view/card-view-component.e2e.ts @@ -15,13 +15,12 @@ * limitations under the License. */ -import { element, by } from 'protractor'; +import { element, by, browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; -import TestConfig = require('../../test.config'); import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage'; import { BrowserVisibility } from '@alfresco/adf-testing'; @@ -32,7 +31,7 @@ describe('CardView Component', () => { const metadataViewPage = new MetadataViewPage(); beforeAll(async (done) => { - loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + loginPage.loginToContentServices(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); navigationBarPage.clickCardViewButton(); done(); diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index a4da5863ee..b6dcc8ddf5 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/e2e/core/datatable/data-table-component-selection.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage'; import { DataTableComponentPage } from '@alfresco/adf-testing'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -35,10 +35,10 @@ describe('Datatable component - selection', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index 897d8a7daa..3bd5b6db71 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -19,7 +19,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage'; import { DataTableComponentPage } from '@alfresco/adf-testing'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -47,10 +47,10 @@ describe('Datatable component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/core/error-component.e2e.ts b/e2e/core/error-component.e2e.ts index d30904b6cb..f98b5747e1 100644 --- a/e2e/core/error-component.e2e.ts +++ b/e2e/core/error-component.e2e.ts @@ -17,7 +17,6 @@ import { LoginPage, ErrorPage, BrowserActions } from '@alfresco/adf-testing'; import { AcsUserModel } from '../models/ACS/acsUserModel'; -import TestConfig = require('../test.config'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; @@ -30,10 +29,10 @@ describe('Error Component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await loginPage.loginToContentServicesUsingUserModel(acsUser); @@ -42,37 +41,37 @@ describe('Error Component', () => { }); it('[C277302] Should display the error 403 when access to unauthorized page - My Change', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/error/403'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/403'); expect(errorPage.getErrorCode()).toBe('403'); expect(errorPage.getErrorTitle()).toBe('You don\'t have permission to access this server.'); expect(errorPage.getErrorDescription()).toBe('You\'re not allowed access to this resource on the server.'); }); it('[C280563] Should back home button navigate to the home page', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/error/404'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/404'); errorPage.clickBackButton(); - expect(browser.getCurrentUrl()).toBe(TestConfig.adf.url + '/'); + expect(browser.getCurrentUrl()).toBe(browser.params.testConfig.adf.url + '/'); }); it('[C280564] Should secondary button by default redirect to report-issue URL', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/error/403'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/403'); errorPage.clickSecondButton(); - expect(browser.getCurrentUrl()).toBe(TestConfig.adf.url + '/report-issue'); + expect(browser.getCurrentUrl()).toBe(browser.params.testConfig.adf.url + '/report-issue'); }); it('[C277304] Should display the error 404 when access to not found page', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/error/404'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/404'); expect(errorPage.getErrorCode()).toBe('404'); expect(errorPage.getErrorTitle()).toBe('An error occurred.'); expect(errorPage.getErrorDescription()).toBe('We couldn’t find the page you were looking for.'); }); it('[C307029] Should display Unknown message when error is undefined', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/error/501'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/error/501'); expect(errorPage.getErrorCode()).toBe('UNKNOWN'); expect(errorPage.getErrorTitle()).toBe('We hit a problem.'); expect(errorPage.getErrorDescription()).toBe('Looks like something went wrong.'); diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts index 077b4a4345..bd9463c621 100644 --- a/e2e/core/header-component.e2e.ts +++ b/e2e/core/header-component.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { HeaderPage, SettingsPage } from '@alfresco/adf-testing'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; @@ -49,12 +49,12 @@ describe('Header Component', () => { beforeAll(async(done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); const users = new UsersActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -73,7 +73,7 @@ describe('Header Component', () => { }); afterAll(async(done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); done(); }); diff --git a/e2e/core/icons-component.e2e.ts b/e2e/core/icons-component.e2e.ts index 6a76b866e8..6bf379a450 100644 --- a/e2e/core/icons-component.e2e.ts +++ b/e2e/core/icons-component.e2e.ts @@ -20,7 +20,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { IconsPage } from '../pages/adf/iconsPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('Universal Icon component', function () { @@ -33,10 +33,10 @@ describe('Universal Icon component', function () { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await loginPage.loginToContentServicesUsingUserModel(acsUser); diff --git a/e2e/core/infinite-scrolling.e2e.ts b/e2e/core/infinite-scrolling.e2e.ts index 57223b2e38..e83b23146d 100644 --- a/e2e/core/infinite-scrolling.e2e.ts +++ b/e2e/core/infinite-scrolling.e2e.ts @@ -23,7 +23,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { Util } from '../util/util'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -57,10 +57,10 @@ describe('Enable infinite scrolling', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index 3dd2dc09cc..03a93dff51 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -24,7 +24,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { UserInfoPage } from '@alfresco/adf-testing'; -import TestConfig = require('../../test.config'); import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -41,8 +40,8 @@ describe('Login component', () => { const loginPage = new LoginPage(); const errorPage = new ErrorPage(); const adminUserModel = new AcsUserModel({ - 'id': TestConfig.adf.adminUser, - 'password': TestConfig.adf.adminPassword + 'id': browser.params.testConfig.adf.adminUser, + 'password': browser.params.testConfig.adf.adminPassword }); const userA = new AcsUserModel(); @@ -60,11 +59,11 @@ describe('Login component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ALL', - hostEcm: TestConfig.adf.url, - hostBpm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url, + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(userA); await this.alfrescoJsApi.core.peopleApi.addPerson(userB); @@ -191,7 +190,7 @@ describe('Login component', () => { expect(loginPage.getSignInButtonIsEnabled()).toBe(false); loginPage.clickSettingsIcon(); settingsPage.setProviderEcm(); - loginPage.login(TestConfig.adf.adminUser, TestConfig.adf.adminPassword); + loginPage.login(browser.params.testConfig.adf.adminUser, browser.params.testConfig.adf.adminPassword); navigationBarPage.clickContentServicesButton(); contentServicesPage.checkAcsContainer(); }); @@ -218,7 +217,7 @@ describe('Login component', () => { settingsPage.setProviderEcmBpm(); loginPage.login(adminUserModel.id, adminUserModel.password); browser.executeScript('window.localStorage.removeItem("ticket-ECM");'); - BrowserActions.getUrl(TestConfig.adf.url + '/files'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files'); loginPage.waitForElements(); }); @@ -238,7 +237,7 @@ describe('Login component', () => { settingsPage.setProviderEcmBpm(); loginPage.login(adminUserModel.id, adminUserModel.password); browser.executeScript('window.localStorage.removeItem("ticket-BPM");'); - BrowserActions.getUrl(TestConfig.adf.url + '/activiti'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); loginPage.waitForElements(); }); @@ -253,9 +252,9 @@ describe('Login component', () => { browser.getAllWindowHandles().then((handles) => { browser.switchTo().window(handles[1]).then(() => { - BrowserActions.getUrl(TestConfig.adf.url + '/activiti'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); processServicesPage.checkApsContainer(); - BrowserActions.getUrl(TestConfig.adf.url + '/files'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files'); contentServicesPage.checkAcsContainer(); }); }); @@ -271,7 +270,7 @@ describe('Login component', () => { }); it('[C291854] Should be possible login in valid credentials', () => { - BrowserActions.getUrl(TestConfig.adf.url); + BrowserActions.getUrl(browser.params.testConfig.adf.url); loginPage.waitForElements(); expect(loginPage.getSignInButtonIsEnabled()).toBe(false); loginPage.enterUsername(invalidUsername); diff --git a/e2e/core/login/login-sso/login-sso.e2e.ts b/e2e/core/login/login-sso/login-sso.e2e.ts index 83f08cee37..a7c9831da6 100644 --- a/e2e/core/login/login-sso/login-sso.e2e.ts +++ b/e2e/core/login/login-sso/login-sso.e2e.ts @@ -16,7 +16,6 @@ */ import { LoginSSOPage, SettingsPage, LoginPage } from '@alfresco/adf-testing'; -import TestConfig = require('../../../test.config'); import { browser } from 'protractor'; import { NavigationBarPage } from '../../../pages/adf/navigationBarPage'; @@ -39,21 +38,27 @@ describe('Login component - SSO', () => { }); it('[C261050] Should be possible login with SSO', () => { - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false, true, 'alfresco'); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco'); loginSSOPage.clickOnSSOButton(); - loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); }); it('[C280667] Should be redirect directly to keycloak without show the login page with silent login', () => { - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, true, true, 'alfresco'); - loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, true, true, 'alfresco'); + loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); }); }); describe('SSO Login Error for login component', () => { - it('[C299205] Should display the login error message when the SSO identity service is wrongly configured', async() => { - await settingsPage.setProviderEcmSso(TestConfig.adf.url, 'http://aps22/auth/realms/alfresco', TestConfig.adf.hostIdentity, false, true, 'alfresco'); + it('[C299205] Should display the login error message when the SSO identity service is wrongly configured', async () => { + await settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + 'http://aps22/auth/realms/alfresco', + browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco'); await loginSSOPage.clickOnSSOButton(); await loginSSOPage.checkLoginErrorIsDisplayed(); expect(loginSSOPage.getLoginErrorMessage()).toContain('SSO Authentication server unreachable'); @@ -64,15 +69,19 @@ describe('Login component - SSO', () => { it('[C299158] Should be possible to login with SSO, with grant type password (Implicit Flow false)', () => { implicitFlow = false; - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco'); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco'); loginPage.waitForElements(); - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco'); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco'); browser.ignoreSynchronization = true; - loginPage.enterUsername(TestConfig.adf.adminEmail); - loginPage.enterPassword(TestConfig.adf.adminPassword); + loginPage.enterUsername(browser.params.testConfig.adf.adminEmail); + loginPage.enterPassword(browser.params.testConfig.adf.adminPassword); loginPage.clickSignInButton(); let isDisplayed = false; @@ -87,18 +96,20 @@ describe('Login component - SSO', () => { } ); return isDisplayed; - }, TestConfig.main.timeout, 'Element is not visible ' + loginPage.header.locator()); + }, browser.params.testConfig.main.timeout, 'Element is not visible ' + loginPage.header.locator()); }); }); it('[C280665] Should be possible change the logout redirect URL', () => { - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, false, true, 'alfresco', '/login'); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco', '/login'); loginSSOPage.clickOnSSOButton(); - loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); navigationBarPage.clickLogoutButton(); browser.getCurrentUrl().then((actualUrl) => { - expect(actualUrl).toEqual(TestConfig.adf.url + '/login'); + expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/login'); }); }); diff --git a/e2e/core/login/redirection.e2e.ts b/e2e/core/login/redirection.e2e.ts index 6840247b34..4f77f6c258 100644 --- a/e2e/core/login/redirection.e2e.ts +++ b/e2e/core/login/redirection.e2e.ts @@ -22,7 +22,6 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ProcessServicesPage } from '../../pages/adf/process-services/processServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import TestConfig = require('../../test.config'); import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -41,8 +40,8 @@ describe('Login component - Redirect', () => { const user = new AcsUserModel(); const userFolderOwner = new AcsUserModel(); const adminUserModel = new AcsUserModel({ - 'id': TestConfig.adf.adminUser, - 'password': TestConfig.adf.adminPassword + 'id': browser.params.testConfig.adf.adminUser, + 'password': browser.params.testConfig.adf.adminPassword }); let uploadedFolder; const uploadActions = new UploadActions(); @@ -51,11 +50,11 @@ describe('Login component - Redirect', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url, - hostBpm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url, + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(user); await this.alfrescoJsApi.core.peopleApi.addPerson(userFolderOwner); @@ -123,7 +122,7 @@ describe('Login component - Redirect', () => { navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id); browser.getCurrentUrl().then((actualUrl) => { - expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id); + expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id); }); contentServicesPage.waitForTableBody(); @@ -139,7 +138,7 @@ describe('Login component - Redirect', () => { loginPage.login(user.id, user.password); browser.getCurrentUrl().then((actualUrl) => { - expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id); + expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id); }); }); @@ -153,7 +152,7 @@ describe('Login component - Redirect', () => { navigationBarPage.openContentServicesFolder(uploadedFolder.entry.id); browser.getCurrentUrl().then((actualUrl) => { - expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id); + expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id); }); contentServicesPage.waitForTableBody(); @@ -174,7 +173,7 @@ describe('Login component - Redirect', () => { navigationBarPage.checkMenuButtonIsDisplayed(); browser.getCurrentUrl().then((actualUrl) => { - expect(actualUrl).toEqual(TestConfig.adf.url + '/files/' + uploadedFolder.entry.id); + expect(actualUrl).toEqual(browser.params.testConfig.adf.url + '/files/' + uploadedFolder.entry.id); }); }); diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index b383dab47b..7045695a59 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -29,7 +29,7 @@ import { UploadActions } from '../actions/ACS/upload.actions'; import { Util } from '../util/util'; import resources = require('../util/resources'); -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; describe('Pagination - returns to previous page when current is empty', () => { @@ -70,10 +70,10 @@ describe('Pagination - returns to previous page when current is empty', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/core/settings-component.e2e.ts b/e2e/core/settings-component.e2e.ts index 36e57ba4d9..0aeacc1e6c 100644 --- a/e2e/core/settings-component.e2e.ts +++ b/e2e/core/settings-component.e2e.ts @@ -21,7 +21,7 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; describe('Settings component', () => { @@ -34,8 +34,8 @@ describe('Settings component', () => { 'Possible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.'; const adminUserModel = new AcsUserModel({ - 'id': TestConfig.adf.adminUser, - 'password': TestConfig.adf.adminPassword + 'id': browser.params.testConfig.adf.adminUser, + 'password': browser.params.testConfig.adf.adminPassword }); describe('Should be able to change Urls in the Settings', () => { @@ -78,8 +78,8 @@ describe('Settings component', () => { loginPage.waitForElements(); settingsPage.goToSettingsPage(); expect(settingsPage.getSelectedOptionText()).toEqual('ALL', 'The Settings changes are not saved'); - expect(settingsPage.getBpmHostUrl()).toEqual(TestConfig.adf.url, 'The BPM Settings changes are not saved'); - expect(settingsPage.getEcmHostUrl()).toEqual(TestConfig.adf.url, 'The ECM Settings changes are not saved'); + expect(settingsPage.getBpmHostUrl()).toEqual(browser.params.testConfig.adf.url, 'The BPM Settings changes are not saved'); + expect(settingsPage.getEcmHostUrl()).toEqual(browser.params.testConfig.adf.url, 'The ECM Settings changes are not saved'); }); @@ -126,8 +126,8 @@ describe('Settings component', () => { beforeAll( (done) => { settingsPage.goToSettingsPage(); settingsPage.setProvider(settingsPage.getEcmAndBpmOption(), 'ALL'); - settingsPage.setContentServicesURL(TestConfig.adf.url); - settingsPage.setProcessServicesURL(TestConfig.adf.url); + settingsPage.setContentServicesURL(browser.params.testConfig.adf.url); + settingsPage.setProcessServicesURL(browser.params.testConfig.adf.url); settingsPage.clickApply(); done(); }); @@ -143,8 +143,8 @@ describe('Settings component', () => { settingsPage.checkProviderOptions(); settingsPage.checkBasicAuthRadioIsSelected(); settingsPage.checkSsoRadioIsNotSelected(); - expect(settingsPage.getEcmHostUrl()).toBe(TestConfig.adf.url); - expect(settingsPage.getBpmHostUrl()).toBe(TestConfig.adf.url); + expect(settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.adf.url); + expect(settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.adf.url); expect(settingsPage.getBackButton().isEnabled()).toBe(true); expect(settingsPage.getApplyButton().isEnabled()).toBe(true); loginPage.goToLoginPage(); @@ -167,12 +167,12 @@ describe('Settings component', () => { expect(settingsPage.getSelectedOptionText()).toBe('BPM'); settingsPage.checkBasicAuthRadioIsSelected(); settingsPage.checkSsoRadioIsNotSelected(); - expect(settingsPage.getBpmHostUrl()).toBe(TestConfig.adf.url); + expect(settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.adf.url); expect(settingsPage.getBackButton().isEnabled()).toBe(true); expect(settingsPage.getApplyButton().isEnabled()).toBe(true); settingsPage.clickBackButton(); loginPage.waitForElements(); - BrowserActions.getUrl(TestConfig.adf.url + '/activiti'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); processServicesPage.checkApsContainer(); processServicesPage.checkAppIsDisplayed('Task App'); }); @@ -194,12 +194,12 @@ describe('Settings component', () => { expect(settingsPage.getSelectedOptionText()).toBe('ECM'); settingsPage.checkBasicAuthRadioIsSelected(); settingsPage.checkSsoRadioIsNotSelected(); - expect(settingsPage.getEcmHostUrl()).toBe(TestConfig.adf.url); + expect(settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.adf.url); expect(settingsPage.getBackButton().isEnabled()).toBe(true); expect(settingsPage.getApplyButton().isEnabled()).toBe(true); settingsPage.clickBackButton(); loginPage.waitForElements(); - BrowserActions.getUrl(TestConfig.adf.url + '/files'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files'); contentServicesPage.checkAcsContainer(); }); @@ -223,15 +223,15 @@ describe('Settings component', () => { expect(settingsPage.getSelectedOptionText()).toBe('ALL'); settingsPage.checkBasicAuthRadioIsSelected(); settingsPage.checkSsoRadioIsNotSelected(); - expect(settingsPage.getEcmHostUrl()).toBe(TestConfig.adf.url); - expect(settingsPage.getBpmHostUrl()).toBe(TestConfig.adf.url); + expect(settingsPage.getEcmHostUrl()).toBe(browser.params.testConfig.adf.url); + expect(settingsPage.getBpmHostUrl()).toBe(browser.params.testConfig.adf.url); expect(settingsPage.getBackButton().isEnabled()).toBe(true); expect(settingsPage.getApplyButton().isEnabled()).toBe(true); settingsPage.clickBackButton(); loginPage.waitForElements(); - BrowserActions.getUrl(TestConfig.adf.url + '/files'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files'); contentServicesPage.checkAcsContainer(); - BrowserActions.getUrl(TestConfig.adf.url + '/activiti'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); processServicesPage.checkApsContainer(); processServicesPage.checkAppIsDisplayed('Task App'); }); diff --git a/e2e/core/user-info-component-cloud.e2e.ts b/e2e/core/user-info-component-cloud.e2e.ts index d57467b40b..c8687e098f 100644 --- a/e2e/core/user-info-component-cloud.e2e.ts +++ b/e2e/core/user-info-component-cloud.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { UserInfoPage } from '@alfresco/adf-testing'; import { IdentityService, ApiService } from '@alfresco/adf-testing'; @@ -29,14 +29,16 @@ describe('User Info - SSO', () => { let identityService: IdentityService; beforeAll(async (done) => { - const apiService = new ApiService('alfresco', TestConfig.adf.url, TestConfig.adf.hostSso, 'ECM'); - await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + const apiService = new ApiService('alfresco', browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM'); + await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); identityService = new IdentityService(apiService); identityUser = await identityService.createIdentityUser(); silentLogin = false; - settingsPage.setProviderEcmSso(TestConfig.adf.url, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin, true, 'alfresco'); + settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, + browser.params.testConfig.adf.hostSso, + browser.params.testConfig.adf.hostIdentity, silentLogin, true, 'alfresco'); loginSSOPage.clickOnSSOButton(); diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index 2884c813b0..19994bd5cf 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -23,7 +23,7 @@ import { FileModel } from '../models/ACS/fileModel'; import PeopleAPI = require('../restAPI/ACS/PeopleAPI'); -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -48,11 +48,11 @@ describe('User Info component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ALL', - hostEcm: TestConfig.adf.url, - hostBpm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url, + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/core/viewer/file-extensions/viewer-arcive.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-arcive.component.e2e.ts index 81e1551436..dd51b10580 100644 --- a/e2e/core/viewer/file-extensions/viewer-arcive.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-arcive.component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; @@ -49,10 +49,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts index 2fb3dbae31..6fa47f75d1 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; @@ -58,10 +58,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts index 5159ef6f29..b4f0a0198e 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; @@ -49,10 +49,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts index 5d0afd6b3c..540311f99b 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; @@ -54,10 +54,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts index 486808ed49..6a4137e998 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts @@ -15,8 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../../../test.config'); - import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; @@ -50,10 +48,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts index b9bea5b420..bb49709789 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; @@ -49,10 +49,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts index d35d6082e0..9a39704f7a 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../../pages/adf/viewerPage'; @@ -49,10 +49,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index 529b0b985c..333a585082 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/e2e/core/viewer/info-drawer.component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../pages/adf/viewerPage'; @@ -52,10 +52,10 @@ describe('Info Drawer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts index 72734595ee..77eb08bc98 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -17,8 +17,6 @@ import { browser } from 'protractor'; -import TestConfig = require('../../test.config'); - import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ViewerPage } from '../../pages/adf/viewerPage'; @@ -81,10 +79,10 @@ describe('Content Services Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts index 56db827cc0..5a0134c6d8 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../pages/adf/viewerPage'; @@ -47,10 +47,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); diff --git a/e2e/core/viewer/viewer-extension.e2e.ts b/e2e/core/viewer/viewer-extension.e2e.ts index 90a7f53782..89a8e1bd2c 100644 --- a/e2e/core/viewer/viewer-extension.e2e.ts +++ b/e2e/core/viewer/viewer-extension.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../pages/adf/viewerPage'; @@ -54,10 +54,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index d7c18bd788..997327b600 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; @@ -55,10 +55,10 @@ describe('Viewer - properties', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts index 0c8c348486..531189e03e 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/e2e/core/viewer/viewer-share-content.ts @@ -15,8 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../../test.config'); - import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../pages/adf/viewerPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -63,10 +61,10 @@ describe('Viewer', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); site = await this.alfrescoJsApi.core.sitesApi.createSite({ @@ -103,11 +101,11 @@ describe('Viewer', () => { }); it('[C260105] Should be able to open an image file shared via API', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); viewerPage.checkImgContainerIsDisplayed(); - BrowserActions.getUrl(TestConfig.adf.url); + BrowserActions.getUrl(browser.params.testConfig.adf.url); navigationBarPage.clickLogoutButton(); - BrowserActions.getUrl(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); viewerPage.checkImgContainerIsDisplayed(); }); @@ -126,7 +124,7 @@ describe('Viewer', () => { viewerPage.checkFileIsLoaded(); viewerPage.checkFileNameIsDisplayed(wordFileInfo.name); - await BrowserActions.getUrl(TestConfig.adf.url); + await BrowserActions.getUrl(browser.params.testConfig.adf.url); navigationBarPage.clickLogoutButton(); await BrowserActions.getUrl(sharedLink); viewerPage.checkFileIsLoaded(); diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index e9578b3dc1..8cce0e016d 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -20,7 +20,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { AnalyticsPage } from '../pages/adf/process-services/analyticsPage'; import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { Tenant } from '../models/APS/tenant'; import { User } from '../models/APS/user'; @@ -39,10 +39,10 @@ describe('Analytics Smoke Test', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/contentServicesPage.ts index 08591447e1..60a8545eb8 100644 --- a/e2e/pages/adf/contentServicesPage.ts +++ b/e2e/pages/adf/contentServicesPage.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../../test.config'); import { CreateFolderDialog } from './dialog/createFolderDialog'; import { CreateLibraryDialog } from './dialog/createLibraryDialog'; import { FormControllersPage } from '@alfresco/adf-testing'; @@ -433,16 +432,16 @@ export class ContentServicesPage { uploadFile(fileLocation) { this.checkUploadButton(); BrowserVisibility.waitUntilElementIsVisible(this.uploadFileButton); - this.uploadFileButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation))); + this.uploadFileButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, fileLocation))); this.checkUploadButton(); return this; } uploadMultipleFile(files) { BrowserVisibility.waitUntilElementIsVisible(this.uploadMultipleFileButton); - let allFiles = path.resolve(path.join(TestConfig.main.rootPath, files[0])); + let allFiles = path.resolve(path.join(browser.params.testConfig.main.rootPath, files[0])); for (let i = 1; i < files.length; i++) { - allFiles = allFiles + '\n' + path.resolve(path.join(TestConfig.main.rootPath, files[i])); + allFiles = allFiles + '\n' + path.resolve(path.join(browser.params.testConfig.main.rootPath, files[i])); } this.uploadMultipleFileButton.sendKeys(allFiles); BrowserVisibility.waitUntilElementIsVisible(this.uploadMultipleFileButton); @@ -451,7 +450,7 @@ export class ContentServicesPage { uploadFolder(folder) { BrowserVisibility.waitUntilElementIsVisible(this.uploadFolderButton); - this.uploadFolderButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, folder))); + this.uploadFolderButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, folder))); BrowserVisibility.waitUntilElementIsVisible(this.uploadFolderButton); return this; } diff --git a/e2e/pages/adf/navigationBarPage.ts b/e2e/pages/adf/navigationBarPage.ts index 7fbd9d32a9..1168181673 100644 --- a/e2e/pages/adf/navigationBarPage.ts +++ b/e2e/pages/adf/navigationBarPage.ts @@ -18,7 +18,6 @@ import { browser, by, element, ElementFinder } from 'protractor'; import { ProcessServicesPage } from './process-services/processServicesPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; -import TestConfig = require('../../test.config'); import { PeopleGroupCloudComponentPage } from './demo-shell/process-services/peopleGroupCloudComponentPage'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; @@ -141,7 +140,7 @@ export class NavigationBarPage { } openContentServicesFolder(folderId) { - return BrowserActions.getUrl(TestConfig.adf.url + '/files/' + folderId); + return BrowserActions.getUrl(browser.params.testConfig.adf.url + '/files/' + folderId); } chooseLanguage(language) { @@ -208,12 +207,12 @@ export class NavigationBarPage { } async openViewer(nodeId) { - await BrowserActions.getUrl(TestConfig.adf.url + `/files(overlay:files/${nodeId}/view`); + await BrowserActions.getUrl(browser.params.testConfig.adf.url + `/files(overlay:files/${nodeId}/view`); return this; } async goToSite(site) { - await BrowserActions.getUrl(TestConfig.adf.url + `/files/${site.entry.guid}/display/list`); + await BrowserActions.getUrl(browser.params.testConfig.adf.url + `/files/${site.entry.guid}/display/list`); } async scrollTo(el: ElementFinder) { diff --git a/e2e/pages/adf/process-services/attachmentListPage.ts b/e2e/pages/adf/process-services/attachmentListPage.ts index fdb24d04cb..765ad371de 100644 --- a/e2e/pages/adf/process-services/attachmentListPage.ts +++ b/e2e/pages/adf/process-services/attachmentListPage.ts @@ -17,7 +17,6 @@ import { element, by, protractor, browser } from 'protractor'; -import TestConfig = require('../../../test.config'); import path = require('path'); import remote = require('selenium-webdriver/remote'); import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; @@ -39,7 +38,7 @@ export class AttachmentListPage { browser.setFileDetector(new remote.FileDetector()); BrowserVisibility.waitUntilElementIsVisible(this.attachFileButton); - return this.attachFileButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation))); + return this.attachFileButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, fileLocation))); } checkFileIsAttached(name) { diff --git a/e2e/pages/adf/versionManagerPage.ts b/e2e/pages/adf/versionManagerPage.ts index 22f50af816..cc94d79f15 100644 --- a/e2e/pages/adf/versionManagerPage.ts +++ b/e2e/pages/adf/versionManagerPage.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../../test.config'); import path = require('path'); import remote = require('selenium-webdriver/remote'); import { browser, by, element } from 'protractor'; @@ -50,7 +49,7 @@ export class VersionManagePage { uploadNewVersionFile(fileLocation) { browser.setFileDetector(new remote.FileDetector()); BrowserVisibility.waitUntilElementIsVisible(this.uploadNewVersionButton); - this.uploadNewVersionButton.sendKeys(path.resolve(path.join(TestConfig.main.rootPath, fileLocation))); + this.uploadNewVersionButton.sendKeys(path.resolve(path.join(browser.params.testConfig.main.rootPath, fileLocation))); BrowserVisibility.waitUntilElementIsVisible(this.showNewVersionButton); return this; } diff --git a/e2e/process-services/apps-section.e2e.ts b/e2e/process-services/apps-section.e2e.ts index ab91683a28..0e4e26e6de 100644 --- a/e2e/process-services/apps-section.e2e.ts +++ b/e2e/process-services/apps-section.e2e.ts @@ -22,7 +22,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -47,10 +46,10 @@ describe('Modify applications', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const user = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index 416f8e8ab4..1d8ebb1b2c 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -23,7 +23,7 @@ import CONSTANTS = require('../util/constants'); import { FileModel } from '../models/ACS/fileModel'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { ViewerPage } from '../pages/adf/viewerPage'; @@ -51,10 +51,10 @@ describe('Start Task - Task App', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(this.alfrescoJsApi); @@ -70,10 +70,10 @@ describe('Start Task - Task App', () => { afterAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); @@ -91,7 +91,7 @@ describe('Start Task - Task App', () => { .addForm(app.formName) .clickStartButton(); - widget.attachFileWidget().attachFile(appFields.attachFile_id, TestConfig.main.rootPath + pdfFile.location); + widget.attachFileWidget().attachFile(appFields.attachFile_id, browser.params.testConfig.main.rootPath + pdfFile.location); widget.attachFileWidget().checkFileIsAttached(appFields.attachFile_id, pdfFile.name); widget.attachFileWidget().viewFile(pdfFile.name); diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index 12fbb8eeec..b0bb770d21 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -22,7 +22,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -54,13 +54,13 @@ describe('Attach Form Component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); const users = new UsersActions(); const appsActions = new AppsActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -82,7 +82,7 @@ describe('Attach Form Component', () => { afterAll(async (done) => { try { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); } catch (error) { } diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index e9a45997dc..a2e4625dc8 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -25,7 +25,7 @@ import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -53,16 +53,16 @@ describe('Checklist component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id); - const pathFile = path.join(TestConfig.main.rootPath + app.file_location); + const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location); const file = fs.createReadStream(pathFile); await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password); diff --git a/e2e/process-services/comment-component-processes.e2e.ts b/e2e/process-services/comment-component-processes.e2e.ts index 5646253d2c..6dbb8e2aef 100644 --- a/e2e/process-services/comment-component-processes.e2e.ts +++ b/e2e/process-services/comment-component-processes.e2e.ts @@ -21,7 +21,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/processFilters import { CommentsPage } from '../pages/adf/commentsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -41,13 +40,13 @@ describe('Comment component for Processes', () => { beforeAll(async(done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); const apps = new AppsActions(); const users = new UsersActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -69,7 +68,7 @@ describe('Comment component for Processes', () => { afterAll(async(done) => { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); diff --git a/e2e/process-services/comment-component-tasks.e2e.ts b/e2e/process-services/comment-component-tasks.e2e.ts index a41409305d..4246089994 100644 --- a/e2e/process-services/comment-component-tasks.e2e.ts +++ b/e2e/process-services/comment-component-tasks.e2e.ts @@ -24,7 +24,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -50,13 +49,13 @@ describe('Comment component for Processes', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); const apps = new AppsActions(); const users = new UsersActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -78,7 +77,7 @@ describe('Comment component for Processes', () => { try { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); } catch (error) { diff --git a/e2e/process-services/custom-process-filters-sorting.e2e.ts b/e2e/process-services/custom-process-filters-sorting.e2e.ts index 75b4e7089a..e03c2b9487 100644 --- a/e2e/process-services/custom-process-filters-sorting.e2e.ts +++ b/e2e/process-services/custom-process-filters-sorting.e2e.ts @@ -22,7 +22,6 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { FiltersPage } from '../pages/adf/process-services/filtersPage'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -55,7 +54,7 @@ describe('Sorting for process filters', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); done(); @@ -64,7 +63,7 @@ describe('Sorting for process filters', () => { beforeEach(async (done) => { const users = new UsersActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); tenantId = user.tenantId; @@ -82,7 +81,7 @@ describe('Sorting for process filters', () => { afterEach(async (done) => { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); diff --git a/e2e/process-services/custom-process-filters.e2e.ts b/e2e/process-services/custom-process-filters.e2e.ts index a0dfe840ca..fafda3e16e 100644 --- a/e2e/process-services/custom-process-filters.e2e.ts +++ b/e2e/process-services/custom-process-filters.e2e.ts @@ -23,8 +23,6 @@ import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processS import { AppSettingsToggles } from '../pages/adf/process-services/dialog/appSettingsToggles'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; @@ -54,10 +52,10 @@ describe('New Process Filters', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -71,7 +69,7 @@ describe('New Process Filters', () => { }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); done(); }); diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index df71df18f7..f3165c6d2d 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -23,7 +23,7 @@ import moment = require('moment'); import { Tenant } from '../models/APS/tenant'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { Util } from '../util/util'; @@ -80,10 +80,10 @@ describe('Start Task - Custom App', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); diff --git a/e2e/process-services/dynamic-table-date-picker.e2e.ts b/e2e/process-services/dynamic-table-date-picker.e2e.ts index 2142185918..59a571674f 100644 --- a/e2e/process-services/dynamic-table-date-picker.e2e.ts +++ b/e2e/process-services/dynamic-table-date-picker.e2e.ts @@ -21,7 +21,7 @@ import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processS import { DatePickerPage } from '../pages/adf/material/datePickerPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -41,13 +41,13 @@ describe('Dynamic Table', () => { beforeAll(async(done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); apps = new AppsActions(); users = new UsersActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -57,7 +57,7 @@ describe('Dynamic Table', () => { }); afterAll(async(done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); diff --git a/e2e/process-services/empty-process-list-component.e2e.ts b/e2e/process-services/empty-process-list-component.e2e.ts index 0d2f3b42ea..9cf6096424 100644 --- a/e2e/process-services/empty-process-list-component.e2e.ts +++ b/e2e/process-services/empty-process-list-component.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -50,10 +50,10 @@ describe('Empty Process List Test', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/form-component.e2e.ts b/e2e/process-services/form-component.e2e.ts index aeec0defa2..f9185ed3e0 100644 --- a/e2e/process-services/form-component.e2e.ts +++ b/e2e/process-services/form-component.e2e.ts @@ -17,7 +17,7 @@ import { LoginPage, Widget, FormPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; @@ -50,12 +50,12 @@ describe('Form Component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); const users = new UsersActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -71,7 +71,7 @@ describe('Form Component', () => { }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); diff --git a/e2e/process-services/form-people-widget.e2e.ts b/e2e/process-services/form-people-widget.e2e.ts index 0360ac2d31..dcd61d80ac 100644 --- a/e2e/process-services/form-people-widget.e2e.ts +++ b/e2e/process-services/form-people-widget.e2e.ts @@ -23,7 +23,6 @@ import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage'; import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -51,10 +50,10 @@ describe('Form widgets - People', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -69,7 +68,7 @@ describe('Form widgets - People', () => { afterAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); diff --git a/e2e/process-services/form-widgets-component.e2e.ts b/e2e/process-services/form-widgets-component.e2e.ts index b0d1aab06f..53d508a9a8 100644 --- a/e2e/process-services/form-widgets-component.e2e.ts +++ b/e2e/process-services/form-widgets-component.e2e.ts @@ -23,7 +23,7 @@ import CONSTANTS = require('../util/constants'); import FormDefinitionModel = require('../models/APS/FormDefinitionModel'); import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -51,10 +51,10 @@ describe('Form widgets', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -83,7 +83,7 @@ describe('Form widgets', () => { }); afterAll(async (done) => { - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); @@ -206,10 +206,10 @@ describe('Form widgets', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -226,7 +226,7 @@ describe('Form widgets', () => { }); beforeEach(async() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -234,7 +234,7 @@ describe('Form widgets', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts index 7eec625d58..88de1f1a7c 100644 --- a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts +++ b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts @@ -21,7 +21,6 @@ import { ProcessFiltersPage } from '../pages/adf/process-services/processFilters import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -54,10 +53,10 @@ describe('Process List - Pagination when adding processes', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts index f6d86b8a93..ebf1bb638c 100644 --- a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts @@ -26,7 +26,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { browser } from 'protractor'; @@ -56,10 +55,10 @@ describe('Items per page set to 15 and adding of tasks', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index 63a89dbcea..9adcb37f4a 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -24,7 +24,7 @@ import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -49,10 +49,10 @@ describe('People component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); @@ -62,7 +62,7 @@ describe('People component', () => { processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id); - const pathFile = path.join(TestConfig.main.rootPath + app.file_location); + const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location); const file = fs.createReadStream(pathFile); await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password); diff --git a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts index cc7ffb3e07..b8a99b8037 100644 --- a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts @@ -22,7 +22,6 @@ import { AttachmentListPage } from '../pages/adf/process-services/attachmentList import { ViewerPage } from '../pages/adf/viewerPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { Util } from '../util/util'; @@ -64,10 +63,10 @@ describe('Attachment list action menu for processes', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -91,7 +90,7 @@ describe('Attachment list action menu for processes', () => { afterAll(async (done) => { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); done(); }); diff --git a/e2e/process-services/process-filters-component.e2e.ts b/e2e/process-services/process-filters-component.e2e.ts index 112191a2b0..a0b1717d2b 100644 --- a/e2e/process-services/process-filters-component.e2e.ts +++ b/e2e/process-services/process-filters-component.e2e.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -63,10 +62,10 @@ describe('Process Filters Test', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -153,7 +152,7 @@ describe('Process Filters Test', () => { return currentApp.modelId === appModel.id; }); - processFilterUrl = TestConfig.adf.url + '/activiti/apps/' + deployedApp.id + '/processes/'; + processFilterUrl = browser.params.testConfig.adf.url + '/activiti/apps/' + deployedApp.id + '/processes/'; return this.alfrescoJsApi.activiti.userFiltersApi.getUserProcessInstanceFilters({appId: deployedApp.id}); }); diff --git a/e2e/process-services/process-instance-details.e2e.ts b/e2e/process-services/process-instance-details.e2e.ts index 708bef6fe4..0d3aaa90dc 100644 --- a/e2e/process-services/process-instance-details.e2e.ts +++ b/e2e/process-services/process-instance-details.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; @@ -48,10 +48,10 @@ describe('Process Instance Details', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -76,7 +76,7 @@ describe('Process Instance Details', () => { afterAll(async (done) => { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appModel.id); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(user.tenantId); diff --git a/e2e/process-services/processList-component.e2e.ts b/e2e/process-services/processList-component.e2e.ts index 857b262647..de5687b45c 100644 --- a/e2e/process-services/processList-component.e2e.ts +++ b/e2e/process-services/processList-component.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage, BrowserActions } from '@alfresco/adf-testing'; import { ProcessListDemoPage } from '../pages/adf/demo-shell/process-services/processListDemoPage'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -57,10 +57,10 @@ describe('Process List Test', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -93,7 +93,7 @@ describe('Process List Test', () => { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appDateModel.id); await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appUserWidgetModel.id); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(user.tenantId); @@ -101,7 +101,7 @@ describe('Process List Test', () => { }); beforeEach((done) => { - BrowserActions.getUrl(TestConfig.adf.url + '/process-list'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/process-list'); done(); }); diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index 6acfc0e562..5355c387b4 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -21,7 +21,7 @@ import { PaginationPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -63,10 +63,10 @@ describe('Process List - Pagination', function () { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(this.alfrescoJsApi); @@ -95,7 +95,7 @@ describe('Process List - Pagination', function () { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password); diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index 037e03cfa6..a3a2a63d0b 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -22,7 +22,7 @@ import { PaginationPage } from '@alfresco/adf-testing'; import CONSTANTS = require('../util/constants'); -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { Util } from '../util/util'; @@ -57,10 +57,10 @@ describe('Task List Pagination - Sorting', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index e43bc47424..d1dfaf6107 100644 --- a/e2e/process-services/standalone-task.e2e.ts +++ b/e2e/process-services/standalone-task.e2e.ts @@ -26,7 +26,6 @@ import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; import Task = require('../models/APS/Task'); -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -49,16 +48,16 @@ describe('Start Task - Task App', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id); - const pathFile = path.join(TestConfig.main.rootPath + app.file_location); + const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location); const file = fs.createReadStream(pathFile); await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password); diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index 53465a165c..f5747de133 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -16,7 +16,6 @@ */ import { Util } from '../util/util'; -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import CONSTANTS = require('../util/constants'); import { LoginPage } from '@alfresco/adf-testing'; @@ -69,10 +68,10 @@ describe('Start Process Component', () => { beforeAll(async (done) => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); @@ -85,7 +84,7 @@ describe('Start Process Component', () => { this.alfrescoJsApiUserTwo = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); await this.alfrescoJsApiUserTwo.login(secondProcUserModel.email, secondProcUserModel.password); diff --git a/e2e/process-services/start-task-custom-app.e2e.ts b/e2e/process-services/start-task-custom-app.e2e.ts index f4ec77bceb..9aa0953ef1 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/e2e/process-services/start-task-custom-app.e2e.ts @@ -27,7 +27,7 @@ import { Tenant } from '../models/APS/tenant'; import { FileModel } from '../models/ACS/fileModel'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -63,10 +63,10 @@ describe('Start Task - Custom App', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index b40cd4ac93..4cbee7e041 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -28,7 +28,7 @@ import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; import { FileModel } from '../models/ACS/fileModel'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -65,10 +65,10 @@ describe('Start Task - Task App', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); @@ -76,7 +76,7 @@ describe('Start Task - Task App', () => { processUserModel = await users.createApsUser(this.alfrescoJsApi, newTenant.id); - const pathFile = path.join(TestConfig.main.rootPath + app.file_location); + const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location); const file = fs.createReadStream(pathFile); await this.alfrescoJsApi.login(processUserModel.email, processUserModel.password); diff --git a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts index 7d52670a5d..f497d81c57 100644 --- a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts @@ -25,7 +25,6 @@ import { ViewerPage } from '../pages/adf/viewerPage'; import CONSTANTS = require('../util/constants'); -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { Util } from '../util/util'; @@ -64,10 +63,10 @@ describe('Attachment list action menu for tasks', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -85,7 +84,7 @@ describe('Attachment list action menu for tasks', () => { afterAll(async(done) => { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); done(); }); @@ -183,7 +182,7 @@ describe('Attachment list action menu for tasks', () => { const newTaskId = newTask.id; - const filePath = path.join(TestConfig.main.rootPath + pngFile.location); + const filePath = path.join(browser.params.testConfig.main.rootPath + pngFile.location); const file = fs.createReadStream(filePath); diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index 21f7a15631..b263de6794 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -23,7 +23,7 @@ import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -52,10 +52,10 @@ describe('Task Audit', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); @@ -73,7 +73,7 @@ describe('Task Audit', () => { }); beforeEach(async (done) => { - await BrowserActions.getUrl(TestConfig.adf.url + '/activiti'); + await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); done(); }); diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index ac94791d81..bd710cd95b 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import { StringUtil } from '@alfresco/adf-testing'; import CONSTANTS = require('../util/constants'); @@ -57,10 +57,10 @@ describe('Task Details - Form', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/task-details-no-form.e2e.ts b/e2e/process-services/task-details-no-form.e2e.ts index 6dedfba6ed..d1654efe0b 100644 --- a/e2e/process-services/task-details-no-form.e2e.ts +++ b/e2e/process-services/task-details-no-form.e2e.ts @@ -23,7 +23,7 @@ import CONSTANTS = require('../util/constants'); import { Tenant } from '../models/APS/tenant'; -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -46,10 +46,10 @@ describe('Task Details - No form', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); diff --git a/e2e/process-services/task-details.e2e.ts b/e2e/process-services/task-details.e2e.ts index 5f58936a60..5d5461b16a 100644 --- a/e2e/process-services/task-details.e2e.ts +++ b/e2e/process-services/task-details.e2e.ts @@ -15,8 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; import { Tenant } from '../models/APS/tenant'; @@ -53,10 +51,10 @@ describe('Task Details component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const newTenant = await this.alfrescoJsApi.activiti.adminTenantsApi.createTenant(new Tenant()); @@ -72,7 +70,7 @@ describe('Task Details component', () => { }); beforeEach(async (done) => { - await BrowserActions.getUrl(TestConfig.adf.url + '/activiti'); + await BrowserActions.getUrl(browser.params.testConfig.adf.url + '/activiti'); done(); }); diff --git a/e2e/process-services/task-filters-component.e2e.ts b/e2e/process-services/task-filters-component.e2e.ts index f8ba879a0a..361a6bc37c 100644 --- a/e2e/process-services/task-filters-component.e2e.ts +++ b/e2e/process-services/task-filters-component.e2e.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { LoginPage } from '@alfresco/adf-testing'; @@ -52,7 +51,7 @@ describe('Task', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); done(); @@ -63,7 +62,7 @@ describe('Task', () => { const apps = new AppsActions(); const users = new UsersActions(); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); const user = await users.createTenantAndUser(this.alfrescoJsApi); @@ -89,7 +88,7 @@ describe('Task', () => { await this.alfrescoJsApi.activiti.modelsApi.deleteModel(appId); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(tenantId); @@ -222,10 +221,10 @@ describe('Task', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/task-filters-sorting.e2e.ts b/e2e/process-services/task-filters-sorting.e2e.ts index 5f4002c145..c5bb31a4b4 100644 --- a/e2e/process-services/task-filters-sorting.e2e.ts +++ b/e2e/process-services/task-filters-sorting.e2e.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); import resources = require('../util/resources'); import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -60,10 +59,10 @@ describe('Task Filters Sorting', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); user = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index a93ccf8d09..5659b8b874 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -22,7 +22,7 @@ import { PaginationPage } from '@alfresco/adf-testing'; import CONSTANTS = require('../util/constants'); -import TestConfig = require('../test.config'); +import { browser } from 'protractor'; import resources = require('../util/resources'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -60,10 +60,10 @@ describe('Task List Pagination', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(this.alfrescoJsApi); processUserModelEmpty = await users.createTenantAndUser(this.alfrescoJsApi); diff --git a/e2e/process-services/widgets/amount-widget.e2e.ts b/e2e/process-services/widgets/amount-widget.e2e.ts index a87214b809..afa43626e3 100644 --- a/e2e/process-services/widgets/amount-widget.e2e.ts +++ b/e2e/process-services/widgets/amount-widget.e2e.ts @@ -22,8 +22,8 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); +import { browser } from 'protractor'; describe('Amount Widget', () => { @@ -43,10 +43,10 @@ describe('Amount Widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -63,7 +63,7 @@ describe('Amount Widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -71,7 +71,7 @@ describe('Amount Widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/attach-folder-widget.e2e.ts b/e2e/process-services/widgets/attach-folder-widget.e2e.ts index df71905a63..4022427d1b 100644 --- a/e2e/process-services/widgets/attach-folder-widget.e2e.ts +++ b/e2e/process-services/widgets/attach-folder-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Attach Folder widget', () => { @@ -40,10 +40,10 @@ describe('Attach Folder widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -60,7 +60,7 @@ describe('Attach Folder widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -68,7 +68,7 @@ describe('Attach Folder widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/checkbox-widget.e2e.ts b/e2e/process-services/widgets/checkbox-widget.e2e.ts index f122a4b029..5a764a258d 100644 --- a/e2e/process-services/widgets/checkbox-widget.e2e.ts +++ b/e2e/process-services/widgets/checkbox-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Checkbox Widget', () => { @@ -41,10 +41,10 @@ describe('Checkbox Widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Checkbox Widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Checkbox Widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/date-time-widget.e2e.ts b/e2e/process-services/widgets/date-time-widget.e2e.ts index 2df71fd539..2f02aa2578 100644 --- a/e2e/process-services/widgets/date-time-widget.e2e.ts +++ b/e2e/process-services/widgets/date-time-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Date and time widget', () => { @@ -41,10 +41,10 @@ describe('Date and time widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Date and time widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Date and time widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/date-widget.e2e.ts b/e2e/process-services/widgets/date-widget.e2e.ts index 5cd2a9d97b..81d03c99a5 100644 --- a/e2e/process-services/widgets/date-widget.e2e.ts +++ b/e2e/process-services/widgets/date-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Date widget', () => { @@ -41,10 +41,10 @@ describe('Date widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Date widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Date widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/document-template-widget.e2e.ts b/e2e/process-services/widgets/document-template-widget.e2e.ts index ba97604301..1feab62773 100644 --- a/e2e/process-services/widgets/document-template-widget.e2e.ts +++ b/e2e/process-services/widgets/document-template-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Document Template widget', () => { @@ -41,10 +41,10 @@ describe('Document Template widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Document Template widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Document Template widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/dropdown-widget.e2e.ts b/e2e/process-services/widgets/dropdown-widget.e2e.ts index b2599634f4..ac8b5693f3 100644 --- a/e2e/process-services/widgets/dropdown-widget.e2e.ts +++ b/e2e/process-services/widgets/dropdown-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Dropdown widget', () => { @@ -41,10 +41,10 @@ describe('Dropdown widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Dropdown widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Dropdown widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts index 34dd2f688c..2e961827ea 100644 --- a/e2e/process-services/widgets/dynamic-table-widget.e2e.ts +++ b/e2e/process-services/widgets/dynamic-table-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Dynamic Table widget ', () => { @@ -43,10 +43,10 @@ describe('Dynamic Table widget ', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -63,7 +63,7 @@ describe('Dynamic Table widget ', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -71,7 +71,7 @@ describe('Dynamic Table widget ', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); @@ -104,10 +104,10 @@ describe('Dynamic Table widget ', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -124,7 +124,7 @@ describe('Dynamic Table widget ', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -132,7 +132,7 @@ describe('Dynamic Table widget ', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/header-widget.e2e.ts b/e2e/process-services/widgets/header-widget.e2e.ts index 5e056f96e0..0c893b611c 100644 --- a/e2e/process-services/widgets/header-widget.e2e.ts +++ b/e2e/process-services/widgets/header-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Header widget', () => { @@ -41,10 +41,10 @@ describe('Header widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Header widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Header widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/hyperlink-widget.e2e.ts b/e2e/process-services/widgets/hyperlink-widget.e2e.ts index 4941a0856c..0c061df859 100644 --- a/e2e/process-services/widgets/hyperlink-widget.e2e.ts +++ b/e2e/process-services/widgets/hyperlink-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Hyperlink widget', () => { @@ -41,10 +41,10 @@ describe('Hyperlink widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Hyperlink widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Hyperlink widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/multi-line-widget.e2e.ts b/e2e/process-services/widgets/multi-line-widget.e2e.ts index 8ab620f3b7..b7624444a8 100644 --- a/e2e/process-services/widgets/multi-line-widget.e2e.ts +++ b/e2e/process-services/widgets/multi-line-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Multi-line Widget', () => { @@ -41,10 +41,10 @@ describe('Multi-line Widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Multi-line Widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Multi-line Widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/number-widget.e2e.ts b/e2e/process-services/widgets/number-widget.e2e.ts index c44b1003c6..e9324e7180 100644 --- a/e2e/process-services/widgets/number-widget.e2e.ts +++ b/e2e/process-services/widgets/number-widget.e2e.ts @@ -22,7 +22,7 @@ import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Number widget', () => { @@ -42,10 +42,10 @@ describe('Number widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -62,7 +62,7 @@ describe('Number widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -70,7 +70,7 @@ describe('Number widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/people-widget.e2e.ts b/e2e/process-services/widgets/people-widget.e2e.ts index 0ae32c2687..a6425b21d0 100644 --- a/e2e/process-services/widgets/people-widget.e2e.ts +++ b/e2e/process-services/widgets/people-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('People widget', () => { @@ -41,10 +41,10 @@ describe('People widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('People widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('People widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts index 1438950375..eb2716856f 100644 --- a/e2e/process-services/widgets/radio-buttons-widget.e2e.ts +++ b/e2e/process-services/widgets/radio-buttons-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Radio Buttons Widget', () => { @@ -41,10 +41,10 @@ describe('Radio Buttons Widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -63,7 +63,7 @@ describe('Radio Buttons Widget', () => { }); beforeEach(async () => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; await BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -71,7 +71,7 @@ describe('Radio Buttons Widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/process-services/widgets/text-widget.e2e.ts b/e2e/process-services/widgets/text-widget.e2e.ts index 785d6956ae..8b0a0cc3d5 100644 --- a/e2e/process-services/widgets/text-widget.e2e.ts +++ b/e2e/process-services/widgets/text-widget.e2e.ts @@ -21,7 +21,7 @@ import { UsersActions } from '../../actions/users.actions'; import { LoginPage, BrowserActions, Widget } from '@alfresco/adf-testing'; import { TasksPage } from '../../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../../util/constants'); -import TestConfig = require('../../test.config'); +import { browser } from 'protractor'; import resources = require('../../util/resources'); describe('Text widget', () => { @@ -41,10 +41,10 @@ describe('Text widget', () => { alfrescoJsApi = new AlfrescoApi({ provider: 'BPM', - hostBpm: TestConfig.adf.url + hostBpm: browser.params.testConfig.adf.url }); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); processUserModel = await users.createTenantAndUser(alfrescoJsApi); @@ -61,7 +61,7 @@ describe('Text widget', () => { }); beforeEach(() => { - const urlToNavigateTo = `${TestConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; + const urlToNavigateTo = `${browser.params.testConfig.adf.url}/activiti/apps/${deployedApp.id}/tasks/`; BrowserActions.getUrl(urlToNavigateTo); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.formFields().checkFormIsDisplayed(); @@ -69,7 +69,7 @@ describe('Text widget', () => { afterAll(async (done) => { await alfrescoJsApi.activiti.processApi.deleteProcessInstance(process.id); - await alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await alfrescoJsApi.activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId); done(); }); diff --git a/e2e/restAPI/ACS/PeopleAPI.js b/e2e/restAPI/ACS/PeopleAPI.js index ba5ddc8ea9..e23f276908 100644 --- a/e2e/restAPI/ACS/PeopleAPI.js +++ b/e2e/restAPI/ACS/PeopleAPI.js @@ -64,7 +64,7 @@ function write(file, uri, header) { */ exports.updateAvatarViaAPI = function (requestUserModel, fileModel, personId) { - var absolutePath = path.resolve(path.join(TestConfig.main.rootPath, fileModel.getLocation())); + var absolutePath = path.resolve(path.join(browser.params.testConfig.main.rootPath, fileModel.getLocation())); var uri = url(RequestCoreAPI.getBaseURL(), peopleBaseUrl, personId, "avatar"); // console.debug("Update avatar via API: fileName=" + fileModel.getName() + " uri=" + uri + " auth=" + requestUserModel.id + " password: " + requestUserModel.password); diff --git a/e2e/search/components/search-checkList.e2e.ts b/e2e/search/components/search-checkList.e2e.ts index 7c25fc73c7..850b459d08 100644 --- a/e2e/search/components/search-checkList.e2e.ts +++ b/e2e/search/components/search-checkList.e2e.ts @@ -23,8 +23,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); - import { SearchConfiguration } from '../search.config'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -61,10 +59,10 @@ describe('Search Checklist Component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -83,13 +81,13 @@ describe('Search Checklist Component', () => { await loginPage.loginToContentServicesUsingUserModel(acsUser); - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=' + randomName + ''); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=' + randomName + ''); done(); }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFile.entry.id); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFolder.entry.id); diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index 1134e9d1ae..722cee6fc3 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/e2e/search/components/search-date-range.e2e.ts @@ -24,8 +24,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; import { SearchConfiguration } from '../search.config'; -import TestConfig = require('../../test.config'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { browser } from 'protractor'; import { DateUtil } from '../../util/dateUtil'; @@ -45,10 +43,10 @@ describe('Search Date Range Filter', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + loginPage.loginToContentServices(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); searchDialog.checkSearchIconIsVisible() .clickOnSearchIcon() diff --git a/e2e/search/components/search-number-range.e2e.ts b/e2e/search/components/search-number-range.e2e.ts index 901d342494..393f1f2fc8 100644 --- a/e2e/search/components/search-number-range.e2e.ts +++ b/e2e/search/components/search-number-range.e2e.ts @@ -22,8 +22,6 @@ import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; -import TestConfig = require('../../test.config'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; @@ -62,10 +60,10 @@ describe('Search Number Range Filter', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/search/components/search-radio.e2e.ts b/e2e/search/components/search-radio.e2e.ts index a03d7dbe13..ae4297006f 100644 --- a/e2e/search/components/search-radio.e2e.ts +++ b/e2e/search/components/search-radio.e2e.ts @@ -23,8 +23,6 @@ import { SearchDialog } from '../../pages/adf/dialog/searchDialog'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import TestConfig = require('../../test.config'); - import { SearchConfiguration } from '../search.config'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -63,10 +61,10 @@ describe('Search Radio Component', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); @@ -83,13 +81,13 @@ describe('Search Radio Component', () => { await loginPage.loginToContentServicesUsingUserModel(acsUser); - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=' + randomName); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=' + randomName); done(); }); afterAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFile.entry.id); await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, createdFolder.entry.id); diff --git a/e2e/search/components/search-slider.e2e.ts b/e2e/search/components/search-slider.e2e.ts index ede782d72a..e893e677b9 100644 --- a/e2e/search/components/search-slider.e2e.ts +++ b/e2e/search/components/search-slider.e2e.ts @@ -22,8 +22,6 @@ import { SearchResultsPage } from '../../pages/adf/searchResultsPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; -import TestConfig = require('../../test.config'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; @@ -56,10 +54,10 @@ describe('Search Number Range Filter', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts index 86e61dea3b..7a040b6a10 100644 --- a/e2e/search/components/search-sorting-picker.e2e.ts +++ b/e2e/search/components/search-sorting-picker.e2e.ts @@ -23,8 +23,6 @@ import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NodeActions } from '../../actions/ACS/node.actions'; -import TestConfig = require('../../test.config'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; @@ -65,10 +63,10 @@ describe('Search Sorting Picker', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -98,7 +96,7 @@ describe('Search Sorting Picker', () => { }); afterEach(async (done) => { - await BrowserActions.getUrl(TestConfig.adf.url); + await BrowserActions.getUrl(browser.params.testConfig.adf.url); done(); }); diff --git a/e2e/search/components/search-text.e2e.ts b/e2e/search/components/search-text.e2e.ts index 119bc48db6..089244985b 100644 --- a/e2e/search/components/search-text.e2e.ts +++ b/e2e/search/components/search-text.e2e.ts @@ -20,8 +20,6 @@ import { browser } from 'protractor'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FolderModel } from '../../models/ACS/folderModel'; -import TestConfig = require('../../test.config'); - import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { LoginPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; @@ -48,10 +46,10 @@ describe('Search component - Text widget', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -74,7 +72,7 @@ describe('Search component - Text widget', () => { }); it('[C289329] Placeholder should be displayed in the widget when the input string is empty', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); searchResultPage.tableIsLoaded(); searchFiltersPage.checkNameFilterIsDisplayed(); @@ -90,7 +88,7 @@ describe('Search component - Text widget', () => { }); it('[C289330] Should be able to change the Field setting', async () => { - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); searchResultPage.tableIsLoaded(); searchFiltersPage.checkCheckListFilterIsDisplayed(); diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index 6f5a3c5dff..5617e25a3a 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -27,7 +27,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FileModel } from '../models/ACS/fileModel'; import { FolderModel } from '../models/ACS/folderModel'; -import TestConfig = require('../test.config'); import { Util } from '../util/util'; import { StringUtil, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; @@ -85,10 +84,10 @@ describe('Search component - Search Bar', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); @@ -128,7 +127,7 @@ describe('Search component - Search Bar', () => { }); afterEach(async (done) => { - await BrowserActions.getUrl(TestConfig.adf.url); + await BrowserActions.getUrl(browser.params.testConfig.adf.url); done(); }); diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index c2d8d5cedb..208d6c9a93 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -23,7 +23,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FileModel } from '../models/ACS/fileModel'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import TestConfig = require('../test.config'); import { StringUtil, DocumentListPage, PaginationPage, LoginPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; import resources = require('../util/resources'); @@ -85,10 +84,10 @@ describe('Search Filters', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -141,7 +140,7 @@ describe('Search Filters', () => { }); it('[C277146] Should Show more/less buttons be hidden when inactive', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); searchFiltersPage.creatorCheckListFiltersPage().checkShowLessButtonIsNotDisplayed() .checkShowMoreButtonIsDisplayed() @@ -151,7 +150,7 @@ describe('Search Filters', () => { }); it('[C286556] Search categories should preserve their collapsed/expanded state after the search', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); searchFiltersPage.clickFileTypeListFilter() .checkFileTypeFilterIsCollapsed() @@ -165,7 +164,7 @@ describe('Search Filters', () => { }); it('[C287796] Should be able to display the correct bucket number after selecting a filter', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); searchFiltersPage.fileTypeCheckListFiltersPage().clickCheckListOption('PNG Image'); @@ -199,7 +198,7 @@ describe('Search Filters', () => { }); it('[C291980] Should group search facets under specified labels', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); searchFiltersPage.checkDefaultFacetQueryGroupIsDisplayed() .checkTypeFacetQueryGroupIsDisplayed() @@ -222,7 +221,7 @@ describe('Search Filters', () => { }); it('[C297509] Should display search intervals under specified labels from config', () => { - BrowserActions.getUrl(TestConfig.adf.url + '/search;q=*'); + BrowserActions.getUrl(browser.params.testConfig.adf.url + '/search;q=*'); searchFiltersPage.checkFacetIntervalsByCreatedIsDisplayed() .checkFacetIntervalsByCreatedIsExpanded() diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index 1f17254616..d47bda6efa 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import TestConfig = require('../test.config'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { StringUtil } from '@alfresco/adf-testing'; @@ -43,7 +42,7 @@ describe('Search Component - Multi-Select Facet', () => { beforeAll(() => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); }); @@ -62,7 +61,7 @@ describe('Search Component - Multi-Select Facet', () => { }); beforeAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); @@ -139,7 +138,7 @@ describe('Search Component - Multi-Select Facet', () => { }); beforeAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(userUploadingTxt); await this.alfrescoJsApi.core.peopleApi.addPerson(userUploadingImg); @@ -201,7 +200,7 @@ describe('Search Component - Multi-Select Facet', () => { }); beforeAll(async (done) => { - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); diff --git a/e2e/search/search-page-component.e2e.ts b/e2e/search/search-page-component.e2e.ts index c91eb30363..bdbc9cd1db 100644 --- a/e2e/search/search-page-component.e2e.ts +++ b/e2e/search/search-page-component.e2e.ts @@ -27,7 +27,6 @@ import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; import { FileModel } from '../models/ACS/fileModel'; -import TestConfig = require('../test.config'); import { Util } from '../util/util'; import resources = require('../util/resources'); import { StringUtil } from '@alfresco/adf-testing'; @@ -78,10 +77,10 @@ describe('Search component - Search Page', () => { this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', - hostEcm: TestConfig.adf.url + hostEcm: browser.params.testConfig.adf.url }); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); await this.alfrescoJsApi.login(acsUser.id, acsUser.password); @@ -92,7 +91,7 @@ describe('Search component - Search Page', () => { await uploadActions.uploadFile(this.alfrescoJsApi, firstFileModel.location, firstFileModel.name, '-my-'); - await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await uploadActions.createEmptyFiles(this.alfrescoJsApi, adminFileNames, newFolderModelUploaded.entry.id); diff --git a/e2e/test.config.js b/e2e/test.config.js index 01bf605608..23a175a11f 100644 --- a/e2e/test.config.js +++ b/e2e/test.config.js @@ -3,23 +3,82 @@ * @class config.test.config */ +let load_env_file = function () { + let ENV_FILE = process.env.ENV_FILE; + + if (ENV_FILE) { + require('dotenv').config({path: ENV_FILE}); + } +}; + +load_env_file(); + const HOST = process.env.URL_HOST_ADF; const HOST_BPM = process.env.URL_HOST_BPM_ADF; const HOST_SSO = process.env.URL_HOST_SSO_ADF; const HOST_IDENTITY = process.env.URL_HOST_IDENTITY; -const USERNAME = process.env.USERNAME_ADF; -const PASSWORD = process.env.PASSWORD_ADF; -const EMAIL = process.env.EMAIL_ADF; const TIMEOUT = parseInt(process.env.TIMEOUT, 10); const PROXY = process.env.PROXY_HOST_ADF; +const DEBUG = process.env.DEBUG; +const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm"; +const OAUTH_HOST = process.env.URL_HOST_SSO_ADF || "keycloak"; +const OAUTH_CLIENDID = process.env.OAUTH_CLIENDID || "activiti"; + +const IDENTITY_HOST = process.env.URL_HOST_IDENTITY || "identity"; +const IDENTITY_ADMIN_EMAIL = process.env.IDENTITY_ADMIN_EMAIL || "defaultadmin"; +const IDENTITY_ADMIN_PASSWORD = process.env.IDENTITY_ADMIN_PASSWORD || "defaultadminpassword"; + +const USERNAME_ADF = process.env.USERNAME_ADF || process.env.IDENTITY_USERNAME_ADF || "defaultuser"; +const PASSWORD_ADF = process.env.PASSWORD_ADF || process.env.IDENTITY_PASSWORD_ADF || "defaultuserpassword"; +const EMAIL = process.env.EMAIL_ADF || USERNAME_ADF; + +const appConfig = { + "bpmHost": BPM_HOST, + "identityHost": IDENTITY_HOST, + "providers": "BPM", + "authType": "OAUTH", + "oauth2": { + "host": OAUTH_HOST, + "clientId": OAUTH_CLIENDID, + "scope": "openid", + "secret": "", + "implicitFlow": true, + "silentLogin": true, + "redirectUri": "/", + "redirectUriLogout": "/logout" + } +}; + +if (DEBUG) { + console.log('======= test.config.js hostBPM ====== '); + console.log('hostBPM : ' + (HOST_BPM || PROXY || HOST)); + console.log('EMAIL : ' + (EMAIL)); + console.log('PROXY_HOST_ADF : ' + PROXY); + console.log('HOST : ' + HOST); + console.log('USERNAME_ADF : ' + USERNAME_ADF + ' PASSWORD_ADF : ' + PASSWORD_ADF); + console.log('IDENTITY_ADMIN_EMAIL : ' + IDENTITY_ADMIN_EMAIL + ' IDENTITY_ADMIN_PASSWORD : ' + IDENTITY_ADMIN_PASSWORD); + console.log(JSON.stringify(appConfig)) +} module.exports = { + appConfig: appConfig, + main: { timeout: TIMEOUT, rootPath: __dirname }, + identityAdmin: { + email: IDENTITY_ADMIN_EMAIL, + password: IDENTITY_ADMIN_PASSWORD + }, + + identityUser: { + email: USERNAME_ADF, + password: PASSWORD_ADF + }, + adf: { /** * base @@ -39,7 +98,7 @@ module.exports = { /** * admin username */ - adminUser: USERNAME, + adminUser: USERNAME_ADF, /** * main admin email @@ -49,7 +108,7 @@ module.exports = { /** * main admin password */ - adminPassword: PASSWORD, + adminPassword: PASSWORD_ADF, hostBPM: HOST_BPM || PROXY || HOST, @@ -66,6 +125,10 @@ module.exports = { baseUrl = HOST; } + if (DEBUG) { + console.log('hostSso baseUrl : ' + baseUrl); + } + return `${baseUrl}/auth/realms/alfresco`; }(), @@ -82,6 +145,9 @@ module.exports = { baseUrl = HOST; } + if (DEBUG) { + console.log('hostIdentity baseUrl : ' + baseUrl); + } return `${baseUrl}/auth/admin/realms/alfresco`; }() diff --git a/lib/testing/README.md b/lib/testing/README.md index 0921549701..65090355d6 100644 --- a/lib/testing/README.md +++ b/lib/testing/README.md @@ -23,7 +23,7 @@ or `./scripts/test-e2e-lib.sh -host http://myadf.example.com -f process-services-cloud` ### How can I run the *cloud* e2e against a *remote* env with *full chrome* ? -Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh` +Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -env .env.cloud` ``` BROWSER_RUN=true FOLDER="process-services-cloud" @@ -34,7 +34,7 @@ or `./scripts/test-e2e-lib.sh -host http://myadf.example.com -f process-services-cloud -b` ### How can I run specific *specs* agains a *remote* env? -Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh` +Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -env .env.cloud` ``` LIST_SPECS="process-services-cloud/apps-section-cloud.e2e.ts,process-services-cloud/task-filters-cloud.e2e.ts" URL_HOST_ADF="http://myadf.example.co" @@ -52,7 +52,7 @@ IDENTITY_USERNAME_ADF="username" IDENTITY_PASSWORD_ADF="password" ``` ### How can I run the *cloud* e2e against a *local* env with *chrome headless* ? -Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -ud` +Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -ud -env .env.cloud` ``` FOLDER="process-services-cloud" URL_HOST_ADF="http://localhost:4200" @@ -61,7 +61,7 @@ URL_HOST_ADF="http://localhost:4200" or `./scripts/test-e2e-lib.sh -ud -host http://localhost:4200 -f process-services-cloud ` ### How can I run the *cloud* e2e against a *local* env with *full chrome* ? -Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -ud` +Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -ud -env .env.cloud` ``` BROWSER_RUN=true FOLDER="process-services-cloud" @@ -71,7 +71,7 @@ URL_HOST_ADF="http://localhost:4200" or `./scripts/test-e2e-lib.sh -ud -host http://localhost:4200 -f process-services-cloud -b` ### How can I run specific *specs* agains a *local* env? -Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -ud` +Add to `.env.cloud` and run `./scripts/test-e2e-lib.sh -ud -env .env.cloud` ``` LIST_SPECS="process-services-cloud/apps-section-cloud.e2e.ts,process-services-cloud/task-filters-cloud.e2e.ts" URL_HOST_ADF="http://localhost:4200" diff --git a/lib/testing/src/lib/core/pages/settings.page.ts b/lib/testing/src/lib/core/pages/settings.page.ts index ad7d5d1c6d..3451afb103 100644 --- a/lib/testing/src/lib/core/pages/settings.page.ts +++ b/lib/testing/src/lib/core/pages/settings.page.ts @@ -59,8 +59,7 @@ export class SettingsPage { goToSettingsPage() { browser.waitForAngularEnabled(true); browser.driver.get(this.settingsURL); - BrowserVisibility.waitUntilElementIsVisible(this.providerDropdown); - return this; + return BrowserVisibility.waitUntilElementIsVisible(this.providerDropdown); } setProvider(option, selected) { @@ -139,7 +138,7 @@ export class SettingsPage { } async setProviderEcmSso(contentServiceURL, authHost, identityHost, silentLogin = true, implicitFlow = true, clientId?: string, logoutUr: string = '/logout') { - this.goToSettingsPage(); + await this.goToSettingsPage(); this.setProvider(this.ecm.option, this.ecm.text); BrowserVisibility.waitUntilElementIsNotOnPage(this.bpmText); BrowserVisibility.waitUntilElementIsVisible(this.ecmText); @@ -151,11 +150,11 @@ export class SettingsPage { this.setImplicitFlow(implicitFlow); this.setLogoutUrl(logoutUr); this.clickApply(); - browser.sleep(1000); + await browser.sleep(1000); } async setProviderBpmSso(processServiceURL, authHost, identityHost, silentLogin = true, implicitFlow = true) { - this.goToSettingsPage(); + await this.goToSettingsPage(); this.setProvider(this.bpm.option, this.bpm.text); BrowserVisibility.waitUntilElementIsVisible(this.bpmText); BrowserVisibility.waitUntilElementIsNotOnPage(this.ecmText); @@ -166,8 +165,8 @@ export class SettingsPage { this.setIdentityHost(identityHost); this.setSilentLogin(silentLogin); this.setImplicitFlow(implicitFlow); - this.clickApply(); - browser.sleep(1000); + await this.clickApply(); + await browser.sleep(1000); } async setLogoutUrl(logoutUrl) { diff --git a/lib/testing/src/lib/core/utils/file-browser.util.ts b/lib/testing/src/lib/core/utils/file-browser.util.ts index 3fb7f5f082..627bec1bc6 100644 --- a/lib/testing/src/lib/core/utils/file-browser.util.ts +++ b/lib/testing/src/lib/core/utils/file-browser.util.ts @@ -19,7 +19,7 @@ import * as path from 'path'; import * as fs from 'fs'; import { browser } from 'protractor'; -const DEFAULT_ROOT_PATH = global['TestConfig'] ? global['TestConfig'].main.rootPath : __dirname; +const DEFAULT_ROOT_PATH = browser.params.testConfig ? browser.params.testConfig.main.rootPath : __dirname; export class FileBrowserUtil { diff --git a/lib/testing/src/lib/test.configuration.ts b/lib/testing/src/lib/test.configuration.ts index 07e8dfc0db..7ef07fc559 100644 --- a/lib/testing/src/lib/test.configuration.ts +++ b/lib/testing/src/lib/test.configuration.ts @@ -16,6 +16,19 @@ */ export interface TestConfiguration { + + appConfig: any; + + identityAdmin: { + email: string, + password: string + }; + + identityUser: { + email: string, + password: string + }; + main: { timeout: number; rootPath: string; diff --git a/package-lock.json b/package-lock.json index 03e9f0ad22..70100937be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -934,6 +934,23 @@ "integrity": "sha512-tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ==", "dev": true }, + "@babel/runtime": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz", + "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.13.2" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==", + "dev": true + } + } + }, "@babel/runtime-corejs2": { "version": "7.3.4", "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.3.4.tgz", @@ -1324,6 +1341,15 @@ "esquery": "^1.0.1" } }, + "@samverschueren/stream-to-observable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", + "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==", + "dev": true, + "requires": { + "any-observable": "^0.3.0" + } + }, "@schematics/angular": { "version": "7.3.6", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.6.tgz", @@ -2057,6 +2083,12 @@ "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", "dev": true }, + "any-observable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz", + "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==", + "dev": true + }, "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", @@ -4025,6 +4057,24 @@ "restore-cursor": "^2.0.0" } }, + "cli-truncate": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz", + "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", + "dev": true, + "requires": { + "slice-ansi": "0.0.4", + "string-width": "^1.0.1" + }, + "dependencies": { + "slice-ansi": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", + "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "dev": true + } + } + }, "cli-width": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", @@ -5105,6 +5155,12 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, + "dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", + "dev": true + }, "deep-eql": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", @@ -5468,6 +5524,12 @@ "is-obj": "^1.0.0" } }, + "dotenv": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz", + "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==", + "dev": true + }, "double-ended-queue": { "version": "2.1.0-0", "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz", @@ -5592,6 +5654,12 @@ "integrity": "sha512-NKwKAXzur5vFCZYBHpdWjTMO8QptNLNP80nItkSIgUOapPAo9Uia+RvkCaZJtO7fhQaVElSvBPWEc2ku6cKsPA==", "dev": true }, + "elegant-spinner": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz", + "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=", + "dev": true + }, "elliptic": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", @@ -6635,6 +6703,12 @@ "readable-stream": "^2.3.6" } }, + "fn-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", + "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", + "dev": true + }, "follow-redirects": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", @@ -7364,6 +7438,17 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "g-status": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/g-status/-/g-status-2.0.2.tgz", + "integrity": "sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==", + "dev": true, + "requires": { + "arrify": "^1.0.1", + "matcher": "^1.0.0", + "simple-git": "^1.85.0" + } + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -7427,6 +7512,12 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, + "get-own-enumerable-property-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", + "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==", + "dev": true + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -9074,6 +9165,15 @@ "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "dev": true }, + "is-observable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", + "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "dev": true, + "requires": { + "symbol-observable": "^1.1.0" + } + }, "is-path-cwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", @@ -10176,6 +10276,231 @@ "uc.micro": "^1.0.1" } }, + "lint-staged": { + "version": "8.1.7", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-8.1.7.tgz", + "integrity": "sha512-egT0goFhIFoOGk6rasPngTFh2qDqxZddM0PwI58oi66RxCDcn5uDwxmiasWIF0qGnchHSYVJ8HPRD5LrFo7TKA==", + "dev": true, + "requires": { + "chalk": "^2.3.1", + "commander": "^2.14.1", + "cosmiconfig": "^5.2.0", + "debug": "^3.1.0", + "dedent": "^0.7.0", + "del": "^3.0.0", + "execa": "^1.0.0", + "find-parent-dir": "^0.3.0", + "g-status": "^2.0.2", + "is-glob": "^4.0.0", + "is-windows": "^1.0.2", + "listr": "^0.14.2", + "listr-update-renderer": "^0.5.0", + "lodash": "^4.17.11", + "log-symbols": "^2.2.0", + "micromatch": "^3.1.8", + "npm-which": "^3.0.1", + "p-map": "^1.1.1", + "path-is-inside": "^1.0.2", + "pify": "^3.0.0", + "please-upgrade-node": "^3.0.2", + "staged-git-files": "1.1.2", + "string-argv": "^0.0.2", + "stringify-object": "^3.2.2", + "yup": "^0.27.0" + }, + "dependencies": { + "cosmiconfig": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", + "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", + "dev": true, + "requires": { + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" + } + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } + }, + "listr": { + "version": "0.14.3", + "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz", + "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==", + "dev": true, + "requires": { + "@samverschueren/stream-to-observable": "^0.3.0", + "is-observable": "^1.1.0", + "is-promise": "^2.1.0", + "is-stream": "^1.1.0", + "listr-silent-renderer": "^1.1.1", + "listr-update-renderer": "^0.5.0", + "listr-verbose-renderer": "^0.5.0", + "p-map": "^2.0.0", + "rxjs": "^6.3.3" + }, + "dependencies": { + "p-map": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", + "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", + "dev": true + } + } + }, + "listr-silent-renderer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz", + "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=", + "dev": true + }, + "listr-update-renderer": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz", + "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==", + "dev": true, + "requires": { + "chalk": "^1.1.3", + "cli-truncate": "^0.2.1", + "elegant-spinner": "^1.0.1", + "figures": "^1.7.0", + "indent-string": "^3.0.0", + "log-symbols": "^1.0.2", + "log-update": "^2.3.0", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" + } + }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, + "log-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", + "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", + "dev": true, + "requires": { + "chalk": "^1.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "listr-verbose-renderer": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz", + "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==", + "dev": true, + "requires": { + "chalk": "^2.4.1", + "cli-cursor": "^2.1.0", + "date-fns": "^1.27.2", + "figures": "^2.0.0" + } + }, "lite-server": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/lite-server/-/lite-server-2.4.0.tgz", @@ -10505,6 +10830,60 @@ "chalk": "^2.0.1" } }, + "log-update": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz", + "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=", + "dev": true, + "requires": { + "ansi-escapes": "^3.0.0", + "cli-cursor": "^2.0.0", + "wrap-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "wrap-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", + "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", + "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0" + } + } + } + }, "log4js": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.11.0.tgz", @@ -11086,6 +11465,15 @@ "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==", "dev": true }, + "matcher": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz", + "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.4" + } + }, "math-random": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz", @@ -12292,6 +12680,15 @@ "npm-bundled": "^1.0.1" } }, + "npm-path": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", + "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==", + "dev": true, + "requires": { + "which": "^1.2.10" + } + }, "npm-pick-manifest": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", @@ -12397,6 +12794,17 @@ "path-key": "^2.0.0" } }, + "npm-which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz", + "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=", + "dev": true, + "requires": { + "commander": "^2.9.0", + "npm-path": "^2.0.2", + "which": "^1.2.10" + } + }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", @@ -13818,6 +14226,12 @@ "with-callback": "^1.0.2" } }, + "property-expr": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-1.5.1.tgz", + "integrity": "sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==", + "dev": true + }, "propose": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/propose/-/propose-0.0.5.tgz", @@ -15753,6 +16167,26 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "simple-git": { + "version": "1.113.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.113.0.tgz", + "integrity": "sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==", + "dev": true, + "requires": { + "debug": "^4.0.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, "slack-node": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz", @@ -16363,6 +16797,12 @@ "safe-buffer": "^5.1.1" } }, + "staged-git-files": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-1.1.2.tgz", + "integrity": "sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==", + "dev": true + }, "state-toggle": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz", @@ -16475,6 +16915,12 @@ "readable-stream": "^2.3.0" } }, + "string-argv": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz", + "integrity": "sha1-2sMECGkMIfPDYwo/86BYd73L1zY=", + "dev": true + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -16517,6 +16963,17 @@ "is-hexadecimal": "^1.0.0" } }, + "stringify-object": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", + "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", + "dev": true, + "requires": { + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" + } + }, "stringstream": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", @@ -17008,6 +17465,12 @@ "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", "dev": true }, + "synchronous-promise": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.9.tgz", + "integrity": "sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==", + "dev": true + }, "systemjs": { "version": "0.19.27", "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.27.tgz", @@ -17497,6 +17960,12 @@ "repeat-string": "^1.6.1" } }, + "toposort": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", + "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=", + "dev": true + }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -19512,6 +19981,20 @@ "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=", "dev": true }, + "yup": { + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz", + "integrity": "sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==", + "dev": true, + "requires": { + "@babel/runtime": "^7.0.0", + "fn-name": "~2.0.1", + "lodash": "^4.17.11", + "property-expr": "^1.5.0", + "synchronous-promise": "^2.0.6", + "toposort": "^2.0.2" + } + }, "zone.js": { "version": "0.8.29", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz", diff --git a/package.json b/package.json index dad186e3c8..18e6f1377e 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,6 @@ "core-js": "^2.5.4", "custom-event-polyfill": "0.3.0", "hammerjs": "2.0.8", - "lint-staged": "^8.1.7", "minimatch-browser": "1.0.0", "moment": "2.22.2", "moment-es6": "^1.0.0", @@ -162,6 +161,7 @@ "karma-systemjs": "0.16.0", "license-checker": "^25.0.1", "lite-server": "^2.4.0", + "lint-staged": "^8.1.7", "markdownlint-cli": "^0.12.0", "mdast-util-compact": "^1.0.1", "mdast-util-heading-range": "^2.1.0", @@ -193,7 +193,7 @@ "typescript": "3.1.6", "unist-util-select": "^2.0.0", "url-join": "^4.0.0", - "webpack-bundle-analyzer": "^2.13.1", + "webpack-bundle-analyzer": "^3.3.2", "webpack-cli": "^3.1.0", "webpack-merge": "2.6.1" }, diff --git a/protractor.conf.js b/protractor.conf.ts similarity index 80% rename from protractor.conf.js rename to protractor.conf.ts index 20b1c2d95b..63a22c62cf 100644 --- a/protractor.conf.js +++ b/protractor.conf.ts @@ -1,72 +1,79 @@ const path = require('path'); -const {SpecReporter} = require('jasmine-spec-reporter'); +const { SpecReporter } = require('jasmine-spec-reporter'); const jasmineReporters = require('jasmine-reporters'); const htmlReporter = require('protractor-html-reporter-2'); const retry = require('protractor-retry').retry; -const tsConfig = require("./e2e/tsconfig.e2e.json"); - +const tsConfig = require('./e2e/tsconfig.e2e.json'); const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility; const TestConfig = require('./e2e/test.config'); -let argv = require('yargs').argv; - +const argv = require('yargs').argv; const fs = require('fs'); const rimraf = require('rimraf'); -require('dotenv').config( { path: './e2e/.env.cloud' }); - const projectRoot = path.resolve(__dirname); - const width = 1366; const height = 768; +let load_env_file = function () { + let ENV_FILE = process.env.ENV_FILE; + + if (ENV_FILE) { + require('dotenv').config({ path: ENV_FILE }); + } +}; + +load_env_file(); + let HOST = process.env.URL_HOST_ADF; -let BROWSER_RUN = process.env.BROWSER_RUN; +let BROWSER_RUN = !!process.env.BROWSER_RUN; let FOLDER = process.env.FOLDER || ''; let SELENIUM_SERVER = process.env.SELENIUM_SERVER || ''; -let DIRECT_CONNECCT = SELENIUM_SERVER ? false : true; +let DIRECT_CONNECCT = !SELENIUM_SERVER; let SELENIUM_PROMISE_MANAGER = parseInt(process.env.SELENIUM_PROMISE_MANAGER); let MAXINSTANCES = process.env.MAXINSTANCES || 1; let TIMEOUT = parseInt(process.env.TIMEOUT, 10); let SAVE_SCREENSHOT = (process.env.SAVE_SCREENSHOT == 'true'); let LIST_SPECS = process.env.LIST_SPECS || []; +let arraySpecs = []; -const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm"; -const OAUTH_HOST = process.env.URL_HOST_SSO_ADF || "keycloak"; -const OAUTH_CLIENDID = process.env.OAUTH_CLIENDID || "activiti"; -const IDENTITY_HOST = process.env.URL_HOST_IDENTITY || "identity"; -const IDENTITY_ADMIN_EMAIL = process.env.IDENTITY_ADMIN_EMAIL || "defaultadmin"; -const IDENTITY_ADMIN_PASSWORD = process.env.IDENTITY_ADMIN_PASSWORD || "defaultadminpassword"; -const USERNAME_ADF = process.env.USERNAME_ADF || process.env.IDENTITY_USERNAME_ADF || "defaultuser"; -const PASSWORD_ADF = process.env.PASSWORD_ADF || process.env.IDENTITY_PASSWORD_ADF || "defaultuserpassword"; - -const appConfig = { - "bpmHost": BPM_HOST, - "identityHost": IDENTITY_HOST, - "providers": "BPM", - "authType": "OAUTH", - "oauth2": { - "host": OAUTH_HOST, - "clientId": OAUTH_CLIENDID, - "scope": "openid", - "secret": "", - "implicitFlow": true, - "silentLogin": true, - "redirectUri": "/", - "redirectUriLogout": "/logout" - } -}; - -let specsToRun = './**/e2e/' + FOLDER + '/**/*.e2e.ts'; - -let args_options = []; - -if (BROWSER_RUN === 'true') { - args_options = ['--incognito', `--window-size=${width},${height}`, '--disable-gpu', '--disable-web-security', '--disable-browser-side-navigation' ]; -} else { - args_options = ['--incognito', '--headless', `--window-size=${width},${height}`, '--disable-gpu', '--disable-web-security', '--disable-browser-side-navigation' ]; +if (process.env.DEBUG) { + console.log('======= PROTRACTOR CONFIGURATION ====== '); + console.log('SAVE_SCREENSHOT : ' + SAVE_SCREENSHOT); + console.log('BROWSER_RUN : ' + BROWSER_RUN); + console.log('FOLDER : ' + FOLDER); + console.log('MAXINSTANCES : ' + MAXINSTANCES); + console.log('LIST_SPECS : ' + LIST_SPECS); } +let browser_options = function () { + let args_options = []; + + if (BROWSER_RUN === true) { + args_options = ['--incognito', `--window-size=${width},${height}`, '--disable-gpu', '--disable-web-security', '--disable-browser-side-navigation']; + } else { + args_options = ['--incognito', '--headless', `--window-size=${width},${height}`, '--disable-gpu', '--disable-web-security', '--disable-browser-side-navigation']; + } + return args_options; +}; + +let args_options = browser_options(); + let downloadFolder = path.join(__dirname, 'e2e/downloads'); +let specs = () => { + let specsToRun = './**/e2e/' + FOLDER + '/**/*.e2e.ts'; + + if (LIST_SPECS.length === 0) { + arraySpecs = [specsToRun]; + } else { + arraySpecs = LIST_SPECS.split(','); + arraySpecs = arraySpecs.map((el) => './' + el); + } + + return arraySpecs; +}; + +specs(); + let buildNumber = () => { let buildNumber = process.env.TRAVIS_BUILD_NUMBER; if (!buildNumber) { @@ -76,8 +83,7 @@ let buildNumber = () => { return process.env.TRAVIS_BUILD_NUMBER; }; - -saveScreenshots = async function (alfrescoJsApi, retryCount) { +let saveScreenshots = async function (alfrescoJsApi, retryCount) { let files = fs.readdirSync(path.join(__dirname, './e2e-output/screenshots')); if (files && files.length > 0) { @@ -126,7 +132,7 @@ saveScreenshots = async function (alfrescoJsApi, retryCount) { } }; -saveReport = async function (filenameReport, alfrescoJsApi) { +let saveReport = async function (filenameReport, alfrescoJsApi) { let pathFile = path.join(__dirname, './e2e-output/junit-report/html', filenameReport + '.html'); let reportFile = fs.createReadStream(pathFile); @@ -170,13 +176,6 @@ saveReport = async function (filenameReport, alfrescoJsApi) { } }; -if (LIST_SPECS.length==0) { - arraySpecs = [specsToRun]; -} else { - arraySpecs = LIST_SPECS.split(','); - arraySpecs = arraySpecs.map( (el) => './'+el); -} - exports.config = { allScriptsTimeout: TIMEOUT, @@ -188,7 +187,9 @@ exports.config = { browserName: 'chrome', shardTestFiles: true, + maxInstances: MAXINSTANCES, + chromeOptions: { prefs: { 'credentials_enable_service': false, @@ -206,15 +207,10 @@ exports.config = { baseUrl: HOST, params: { - config: appConfig, - identityAdmin: { - email: IDENTITY_ADMIN_EMAIL, - password: IDENTITY_ADMIN_PASSWORD - }, - identityUser: { - email: USERNAME_ADF, - password: PASSWORD_ADF - } + testConfig: TestConfig, + config: TestConfig.appConfig, + identityAdmin: TestConfig.identityAdmin, + identityUser: TestConfig.identityUser, }, framework: 'jasmine2', @@ -257,7 +253,6 @@ exports.config = { let failFast = require('jasmine-fail-fast'); jasmine.getEnv().addReporter(failFast.init()); - global.TestConfig = TestConfig; require('ts-node').register({ project: 'e2e/tsconfig.e2e.json' }); @@ -306,6 +301,7 @@ exports.config = { }, beforeLaunch: function () { + let reportsFolder = `${projectRoot}/e2e-output/junit-report/`; fs.exists(reportsFolder, function (exists, error) { @@ -318,6 +314,7 @@ exports.config = { console.error('[ERROR] fs', error); } }); + }, afterLaunch: async function () { @@ -339,7 +336,7 @@ exports.config = { if (files && files.length > 0) { for (const fileName of files) { - testConfigReport = { + const testConfigReport = { reportTitle: 'Protractor Test Execution Report', outputPath: temporaryHtmlPath, outputFilename: Math.random().toString(36).substr(2, 5) + filenameReport, diff --git a/scripts/README.md b/scripts/README.md index 80e0d542ff..fd86e50c49 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -405,7 +405,7 @@ Run a single test if the test in a subfolder in e2e you need to add the subfolder in the path: -```shnpm in +```sh ./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin --spec ./core/filenam.e2e.ts ``` diff --git a/scripts/affected-folder.sh b/scripts/git-util/affected-folder.sh similarity index 100% rename from scripts/affected-folder.sh rename to scripts/git-util/affected-folder.sh diff --git a/scripts/check-branch-updated.sh b/scripts/git-util/check-branch-updated.sh similarity index 100% rename from scripts/check-branch-updated.sh rename to scripts/git-util/check-branch-updated.sh diff --git a/scripts/test-e2e-lib.sh b/scripts/test-e2e-lib.sh index def1337364..65107b5d5b 100755 --- a/scripts/test-e2e-lib.sh +++ b/scripts/test-e2e-lib.sh @@ -14,6 +14,7 @@ DEBUG=false show_help() { echo "Usage: ./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin" echo "" + echo "--env" echo "-u or --username" echo "-p or --password" echo "-e or --email" @@ -106,12 +107,16 @@ set_selenium(){ SELENIUM_SERVER=$1 } +set_env(){ + export ENV_FILE=$1 +} + lint(){ EXECLINT=true } debug(){ - DEBUG=true + export DEBUG=true; } lite_server(){ @@ -148,6 +153,7 @@ while [[ $1 == -* ]]; do -f|--folder) set_test_folder $2; shift 2;; -timeout|--timeout) set_timeout $2; shift 2;; -b|--browser) set_browser; shift;; + -env|--env) set_env $2; shift 2;; -dev|--dev) set_development; shift;; -s|--specs) set_specs $2; shift 2;; -db|--debug) debug; shift;; @@ -197,13 +203,13 @@ else if [[ $LITESERVER == "true" ]]; then echo "====== Run dist in lite-server =====" ls demo-shell/dist - npm run lite-server-e2e>/dev/null & ./node_modules/protractor/bin/protractor protractor.conf.js || exit 1 - else - if [[ $DEBUG == "true" ]]; then + npm run lite-server-e2e>/dev/null & ./node_modules/protractor/bin/protractor protractor.conf.ts || exit 1 + else + if [[ $DEBUG == "true" ]]; then echo "====== DEBUG =====" - node --inspect-brk ./node_modules/protractor/bin/protractor protractor.conf.js || exit 1 + node --inspect-brk ./node_modules/protractor/bin/protractor protractor.conf.ts || exit 1 else - ./node_modules/protractor/bin/protractor protractor.conf.js || exit 1 + ./node_modules/protractor/bin/protractor protractor.conf.ts || exit 1 fi fi fi diff --git a/scripts/travis/e2e/content-services-e2e.sh b/scripts/travis/e2e/content-services-e2e.sh index 20ee30c4c8..7d9ea5edc3 100755 --- a/scripts/travis/e2e/content-services-e2e.sh +++ b/scripts/travis/e2e/content-services-e2e.sh @@ -5,9 +5,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ CONTEXT_ENV="content-services" -./scripts/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + +./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; -AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; RUN_CHECK=$(echo node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1) RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -b || exit 1) diff --git a/scripts/travis/e2e/core-e2e.sh b/scripts/travis/e2e/core-e2e.sh index 7c49a6f364..8215044b57 100755 --- a/scripts/travis/e2e/core-e2e.sh +++ b/scripts/travis/e2e/core-e2e.sh @@ -5,9 +5,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ CONTEXT_ENV="core" -./scripts/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + +./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; -AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; RUN_CHECK_PS=$(echo node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 ) RUN_CHECK_CS=$(echo node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 ) @@ -26,7 +28,8 @@ else if [[ $AFFECTED_E2E = "e2e/$CONTEXT_ENV" ]]; if [[ $LIST_SPECS != "" ]]; then echo "Run $CONTEXT_ENV e2e based on the sha $HEAD_SHA_BRANCH with the specs: "$LIST_SPECS - $RUN_CHECK + $RUN_CHECK_PS + $RUN_CHECK_CS $RUN_E2E --specs "$LIST_SPECS" fi fi diff --git a/scripts/travis/e2e/insights-e2e.sh b/scripts/travis/e2e/insights-e2e.sh index 5e2fd019d6..fce77198f2 100755 --- a/scripts/travis/e2e/insights-e2e.sh +++ b/scripts/travis/e2e/insights-e2e.sh @@ -4,7 +4,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ -./scripts/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; +./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $TRAVIS_PULL_REQUEST == "false" ]]; then diff --git a/scripts/travis/e2e/process-services-cloud-e2e.sh b/scripts/travis/e2e/process-services-cloud-e2e.sh index 35e81ef507..2949765474 100755 --- a/scripts/travis/e2e/process-services-cloud-e2e.sh +++ b/scripts/travis/e2e/process-services-cloud-e2e.sh @@ -5,9 +5,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ CONTEXT_ENV="process-services-cloud" -./scripts/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + +./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; -AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; RUN_CHECK=$(echo node ./scripts/check-env/check-activiti-env.js --host "$E2E_HOST_BPM" --oauth "$E2E_HOST_SSO" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" --client 'activiti' || exit 1 ) RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST_BPM" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" --use-dist ) diff --git a/scripts/travis/e2e/process-services-e2e.sh b/scripts/travis/e2e/process-services-e2e.sh index 339aee8c14..be2c3c8a83 100755 --- a/scripts/travis/e2e/process-services-e2e.sh +++ b/scripts/travis/e2e/process-services-e2e.sh @@ -5,12 +5,14 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ CONTEXT_ENV="process-services" -./scripts/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + +./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; -AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV/")"; +AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV/")"; RUN_CHECK=$(echo node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 ) -RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -b ) +RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -b -m 2 ) if [[ $AFFECTED_LIBS =~ "$CONTEXT_ENV$" || $TRAVIS_PULL_REQUEST == "false" ]]; then diff --git a/scripts/travis/e2e/search-e2e.sh b/scripts/travis/e2e/search-e2e.sh index 9e2c4a5d8d..438b41031c 100755 --- a/scripts/travis/e2e/search-e2e.sh +++ b/scripts/travis/e2e/search-e2e.sh @@ -5,9 +5,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ CONTEXT_ENV="search" -./scripts/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + +./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1; + AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; -AFFECTED_E2E="$(./scripts/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; +AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")"; RUN_CHECK=$(echo node ./scripts/check-env/check-cs-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1 ) RUN_E2E=$(echo ./scripts/test-e2e-lib.sh -host http://localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --use-dist -save -b ) diff --git a/tools/i18n/li18nt/client/package.json b/tools/i18n/li18nt/client/package.json index 0f492554d9..fb173fcf4e 100644 --- a/tools/i18n/li18nt/client/package.json +++ b/tools/i18n/li18nt/client/package.json @@ -52,7 +52,7 @@ "postinstall": "node ./node_modules/vscode/bin/install" }, "dependencies": { - "vscode": "^1.1.17", - "vscode-languageclient": "^4.1.3" + "vscode": "^1.1.34", + "vscode-languageclient": "^5.2.1" } }