inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-09-17 14:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add as group suffix the travis build number (#5072)

Browse Source
This commit is contained in:
Maurizio Vitale
2019-09-17 12:41:35 +01:00
committed by Eugenio Romano
parent 8ee3e25caf
commit b2966bc6f5
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/testing/src/lib/core/actions/identity/group-identity.service.ts
View File

@@ -17,6 +17,7 @@
import { ApiService } from '../api.service'; import { ApiService } from '../api.service';
import { StringUtil } from '../../utils/string.util'; import { StringUtil } from '../../utils/string.util';
import { browser } from 'protractor';
export class GroupIdentityService { export class GroupIdentityService {
@@ -40,7 +41,7 @@ export class GroupIdentityService {
const path = '/groups'; const path = '/groups';
const method = 'POST'; const method = 'POST';
const queryParams = {}, postBody = { const queryParams = {}, postBody = {
name: groupName + 'TestGroup' name: `${groupName}-${browser.params.groupSuffix}`
}; };
const data = await this.api.performIdentityOperation(path, method, queryParams, postBody); const data = await this.api.performIdentityOperation(path, method, queryParams, postBody);
return data; return data;

2
protractor.conf.ts
View File

@@ -13,6 +13,7 @@ const projectRoot = path.resolve(__dirname);
const width = 1366, height = 768; const width = 1366, height = 768;
let ENV_FILE = process.env.ENV_FILE; let ENV_FILE = process.env.ENV_FILE;
let GROUP_SUFFIX = process.env.PREFIX;
if (ENV_FILE) { if (ENV_FILE) {
require('dotenv').config({ path: ENV_FILE }); require('dotenv').config({ path: ENV_FILE });
@@ -101,6 +102,7 @@ exports.config = {
params: { params: {
testConfig: TestConfig, testConfig: TestConfig,
config: TestConfig.appConfig, config: TestConfig.appConfig,
groupSuffix: GROUP_SUFFIX,
identityAdmin: TestConfig.identityAdmin, identityAdmin: TestConfig.identityAdmin,
identityUser: TestConfig.identityUser, identityUser: TestConfig.identityUser,
rootPath: __dirname rootPath: __dirname

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

@@ -132,6 +132,11 @@ set_env(){
export ENV_FILE=$1 export ENV_FILE=$1
} }
set_prefix(){
PREFIX=$1
export PREFIX=$PREFIX
}
lint(){ lint(){
EXECLINT=true EXECLINT=true
} }
@@ -174,6 +179,7 @@ while [[ $1 == -* ]]; do
-env|--env) set_env $2; shift 2;; -env|--env) set_env $2; shift 2;;
-dev|--dev) set_development; shift;; -dev|--dev) set_development; shift;;
-s|--specs) set_specs $2; shift 2;; -s|--specs) set_specs $2; shift 2;;
-prefix|--prefix) set_prefix $2; shift 2;;
-db|--debug) debug; shift;; -db|--debug) debug; shift;;
-ud|--use-dist) lite_server; shift;; -ud|--use-dist) lite_server; shift;;
-save) set_save_screenshot; shift;; -save) set_save_screenshot; shift;;

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

@@ -11,7 +11,7 @@ CONTEXT_ENV="process-services-cloud"
AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)";
AFFECTED_E2E="$(./scripts/git-util/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_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" -identity_admin_email "$E2E_ADMIN_EMAIL_IDENTITY" -identity_admin_password "$E2E_ADMIN_PASSWORD_IDENTITY" --use-dist -gnu ) 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" -identity_admin_email "$E2E_ADMIN_EMAIL_IDENTITY" -identity_admin_password "$E2E_ADMIN_PASSWORD_IDENTITY" -prefix $TRAVIS_BUILD_NUMBER --use-dist -gnu )
if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]];
then then