inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

protractor option disable controlflow (#4598)

Browse Source
This commit is contained in:
Eugenio Romano
2019-04-12 12:47:14 +01:00
committed by GitHub
parent 6ad63055b3
commit dac3bed09f
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e2e/proxy.ts
View File

@@ -18,7 +18,8 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
export async function setConfigField(field: string, value: string) { export async function setConfigField(field: string, value: string) {
return browser.executeScript( return browser.executeScript(
`window.adf.setConfigField('${field}', '${value}');` "window.adf.setConfigField(`"+field + "`, `" + value + "`);"
); );
} }

7
protractor.conf.js
View File

@@ -22,6 +22,7 @@ let BROWSER_RUN = process.env.BROWSER_RUN;
let FOLDER = process.env.FOLDER || ''; let FOLDER = process.env.FOLDER || '';
let SELENIUM_SERVER = process.env.SELENIUM_SERVER || ''; let SELENIUM_SERVER = process.env.SELENIUM_SERVER || '';
let DIRECT_CONNECCT = SELENIUM_SERVER ? false : true; let DIRECT_CONNECCT = SELENIUM_SERVER ? false : true;
let SELENIUM_PROMISE_MANAGER = parseInt(process.env.SELENIUM_PROMISE_MANAGER);
let MAXINSTANCES = process.env.MAXINSTANCES || 1; let MAXINSTANCES = process.env.MAXINSTANCES || 1;
let TIMEOUT = parseInt(process.env.TIMEOUT, 10); let TIMEOUT = parseInt(process.env.TIMEOUT, 10);
let SAVE_SCREENSHOT = (process.env.SAVE_SCREENSHOT == 'true'); let SAVE_SCREENSHOT = (process.env.SAVE_SCREENSHOT == 'true');
@@ -199,6 +200,8 @@ exports.config = {
*/ */
seleniumAddress: SELENIUM_SERVER, seleniumAddress: SELENIUM_SERVER,
SELENIUM_PROMISE_MANAGER: SELENIUM_PROMISE_MANAGER,
plugins: [{ plugins: [{
package: 'jasmine2-protractor-utils', package: 'jasmine2-protractor-utils',
disableScreenshot: false, disableScreenshot: false,
@@ -213,6 +216,7 @@ exports.config = {
}, },
onPrepare() { onPrepare() {
retry.onPrepare(); retry.onPrepare();
global.TestConfig = TestConfig; global.TestConfig = TestConfig;
@@ -269,12 +273,11 @@ exports.config = {
fs.exists(reportsFolder, function (exists, error) { fs.exists(reportsFolder, function (exists, error) {
if (exists) { if (exists) {
rimraf(reportsFolder, function (err) { rimraf(reportsFolder, function (err) {
console.log('[ERROR] rimraf: ', err);
}); });
} }
if (error) { if (error) {
console.log('[ERROR] fs', error); console.error('[ERROR] fs', error);
} }
}); });
}, },

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

@@ -8,6 +8,7 @@ EXECLINT=true
LITESERVER=false LITESERVER=false
EXEC_VERSION_JSAPI=false EXEC_VERSION_JSAPI=false
TIMEOUT=7000 TIMEOUT=7000
SELENIUM_PROMISE_MANAGER=1
show_help() { show_help() {
echo "Usage: ./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin" echo "Usage: ./scripts/test-e2e-lib.sh -host adf.domain.com -u admin -p admin -e admin"
@@ -29,6 +30,7 @@ show_help() {
echo "-timeout or --timeout override the timeout foe the wait utils" echo "-timeout or --timeout override the timeout foe the wait utils"
echo "-sl --skip-lint skip lint" echo "-sl --skip-lint skip lint"
echo "-m --maxInstances max instances parallel for tests" echo "-m --maxInstances max instances parallel for tests"
echo "-disable-control-flow disable control flow"
echo "-vjsapi install different version from npm of JS-API defined in the package.json" echo "-vjsapi install different version from npm of JS-API defined in the package.json"
echo "-h or --help" echo "-h or --help"
} }
@@ -104,6 +106,11 @@ max_instances(){
MAXINSTANCES=$1 MAXINSTANCES=$1
} }
disable_control_flow(){
echo "====== disable control flow ====="
SELENIUM_PROMISE_MANAGER=0
}
version_js_api() { version_js_api() {
JSAPI_VERSION=$1 JSAPI_VERSION=$1
@@ -138,6 +145,7 @@ while [[ $1 == -* ]]; do
-sl|--skip-lint) skip_lint; shift;; -sl|--skip-lint) skip_lint; shift;;
-m|--maxInstances) max_instances $2; shift 2;; -m|--maxInstances) max_instances $2; shift 2;;
-vjsapi) version_js_api $2; shift 2;; -vjsapi) version_js_api $2; shift 2;;
-disable-control-flow|--disable-control-flow) disable_control_flow; shift;;
-*) echo "invalid option: $1" 1>&2; show_help; exit 1;; -*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
esac esac
done done
@@ -160,6 +168,7 @@ export FOLDER=$FOLDER'/'
export SELENIUM_SERVER=$SELENIUM_SERVER export SELENIUM_SERVER=$SELENIUM_SERVER
export NAME_TEST=$NAME_TEST export NAME_TEST=$NAME_TEST
export MAXINSTANCES=$MAXINSTANCES export MAXINSTANCES=$MAXINSTANCES
export SELENIUM_PROMISE_MANAGER=$SELENIUM_PROMISE_MANAGER
if $EXEC_VERSION_JSAPI == true; then if $EXEC_VERSION_JSAPI == true; then