mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
Disable control flow e2e ADF (#4954)
* update project script possible different JS-API * first commit no controll flow * second commit no controll flow * third commit no controll flow * 4 commit no controll flow * 5 commit no controll flow * 6 commit no controll flow * 7 commit no controll flow * 8 commit no controll flow * 9 commit no controll flow * 10 commit no controll flow * 11 commit no controll flow * 12 commit no controll flow * 13 commit no controll flow * 14 commit no controll flow * 15 commit no controll flow * 16 commit no controll flow * 17 commit no controll flow * 18 commit no controll flow * 19 commit no controll flow * 20 commit no controll flow * remove wdpromise, protractor promise and deferred promises * - fixed some incorrect “expect” calls - fixed some matchers - removed “return this;” when not needed - added a few more await-s * forgot a file * fix some failing tests * replaced driver calls with browser calls and enabled back waitForAngular * fix rightClick methods and hopefully some tests * fix settings-component * some more fixes for core and content tests * try to fix some more issues * linting * revert some changes, allowing download on headless chrome won’t work with multiple browser instances * fixes for Search tests * try to remove some wait calls * fix build * increase allScriptsTimeout and try another protractor and web driver version * improve navigation methods * some fixes for notification history and login sso * forgot a space * fix packages and enable some screenshots * navigation bar fixes * fix some test * some fixes for notification history and navigation bar use correct visibility method in attachFileWidget test * fix searching and another fix for navigation * try solve sso login * some more fixes * refactor async forEach into for..of * try fix for search tests * resolve rebabse problems * remove install * fix lint * fix core e2e * fix core e2e * fix core e2e * fix ps tests * fix some tests * fix core e2e * fix core e2e * fix core * fix some issues PS * fix core * fix core * fix some ps test * fix rebase issues * remove save * fix url regressed after rebase * fix url regressed after rebase * fix ps and core * fix lint * more parallel e2e ps * fix some ps cloud test * some cloud fix * fix lint * fix some test * remove files to be ignored * out-tsc * improve one cs test * fix candidate base app * fix ps test * remove click function * clean methods alrady present in browser action * try ugly wait * move wait * remove duplicate call * remove underscore * fix after review * fix imports * minor cosmetic fixes * fix comments test
This commit is contained in:
@@ -6,7 +6,7 @@ let ACTIVITI7_APPS = require('../../e2e/util/resources').ACTIVITI7_APPS;
|
||||
|
||||
let config = {};
|
||||
let absentApps = [];
|
||||
let pushFaileApps = [];
|
||||
let pushFailedApps = [];
|
||||
let notRunningApps = [];
|
||||
let host;
|
||||
|
||||
@@ -97,15 +97,13 @@ async function main() {
|
||||
}
|
||||
|
||||
async function deleteStaleApps(alfrescoJsApi, notRunningAppAfterWait) {
|
||||
|
||||
notRunningAppAfterWait.forEach(async (currentApp) => {
|
||||
for (const currentApp of notRunningAppAfterWait) {
|
||||
await deleteApp(alfrescoJsApi, currentApp.entry.name);
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
async function waitPossibleStaleApps(alfrescoJsApi, notRunning) {
|
||||
pushFaileApps = [];
|
||||
pushFailedApps = [];
|
||||
do {
|
||||
console.log(`Wait stale app ${TIMEOUT}`);
|
||||
|
||||
@@ -113,7 +111,6 @@ async function waitPossibleStaleApps(alfrescoJsApi, notRunning) {
|
||||
console.log(`${currentApp.entry.name } ${currentApp.entry.status}`);
|
||||
});
|
||||
|
||||
|
||||
sleep(TIMEOUT);
|
||||
counter++;
|
||||
|
||||
@@ -174,19 +171,19 @@ async function getPushFailedApps(alfrescoJsApi) {
|
||||
});
|
||||
|
||||
if (isNotRunning && isNotRunning.entry.status === 'ImagePushFailed') {
|
||||
pushFaileApps.push(isNotRunning);
|
||||
pushFailedApps.push(isNotRunning);
|
||||
}
|
||||
});
|
||||
|
||||
if (pushFaileApps.length > 0) {
|
||||
console.log(`The following apps are pushFaileApps:`);
|
||||
pushFaileApps.forEach((currentApp) => {
|
||||
if (pushFailedApps.length > 0) {
|
||||
console.log(`The following apps are pushFailedApps:`);
|
||||
pushFailedApps.forEach((currentApp) => {
|
||||
console.log(`App ${currentApp.entry.name } current status ${JSON.stringify(currentApp.entry.status)}`);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
return pushFaileApps;
|
||||
return pushFailedApps;
|
||||
}
|
||||
|
||||
async function deployAbsentApps(alfrescoJsApi) {
|
||||
|
@@ -42,9 +42,9 @@ async function main() {
|
||||
console.log('Login error' + e);
|
||||
}
|
||||
|
||||
Object.keys(ACTIVITI7_APPS).forEach(async (key) => {
|
||||
for (const key of Object.keys(ACTIVITI7_APPS)) {
|
||||
await deleteApp(alfrescoJsApi, ACTIVITI7_APPS[key].name);
|
||||
});
|
||||
}
|
||||
|
||||
let notRunning = await getNotRunningApps(this.alfrescoJsApi);
|
||||
|
||||
|
@@ -13,7 +13,6 @@ eval GIT_ISH=""
|
||||
eval SINGLE_TEST=""
|
||||
eval EXEC_VERSION_JSAPI=false
|
||||
eval JSAPI_VERSION=""
|
||||
eval EXECLINT=true
|
||||
|
||||
eval projects=( "core"
|
||||
"content-services"
|
||||
@@ -94,10 +93,6 @@ exec_install(){
|
||||
EXEC_INSTALL=false
|
||||
}
|
||||
|
||||
skip_lint(){
|
||||
EXECLINT=false
|
||||
}
|
||||
|
||||
while [[ $1 == -* ]]; do
|
||||
case "$1" in
|
||||
-h|--help|-\?) show_help; exit 0;;
|
||||
@@ -113,7 +108,6 @@ while [[ $1 == -* ]]; do
|
||||
-c|--clean) clean; shift;;
|
||||
-si|--skipinstall) exec_install; shift;;
|
||||
-sb|--skipbuild) exclude_build; shift;;
|
||||
-sl|--skip-lint) skip_lint; shift;;
|
||||
-*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
|
||||
esac
|
||||
done
|
||||
@@ -131,10 +125,6 @@ if $EXEC_INSTALL == true; then
|
||||
npm install
|
||||
fi
|
||||
|
||||
if $EXECLINT == true; then
|
||||
./scripts/lint.sh || exit 1;
|
||||
fi
|
||||
|
||||
if $EXEC_GIT_NPM_INSTALL_JSAPI == true; then
|
||||
echo "====== Use the alfresco JS-API '$GIT_ISH'====="
|
||||
npm install $GIT_ISH --no-save
|
||||
|
@@ -7,7 +7,7 @@ DEVELOPMENT=false
|
||||
EXECLINT=false
|
||||
LITESERVER=false
|
||||
EXEC_VERSION_JSAPI=false
|
||||
TIMEOUT=15000
|
||||
TIMEOUT=120000
|
||||
SELENIUM_PROMISE_MANAGER=1
|
||||
DEBUG=false
|
||||
eval GNU=false
|
||||
@@ -40,7 +40,6 @@ show_help() {
|
||||
echo "-l --lint enable lint"
|
||||
echo "-m --maxInstances max instances parallel for tests"
|
||||
echo "-log or --log print all the browser log"
|
||||
echo "-disable-control-flow disable control flow"
|
||||
echo "-db or --debug run the debugger"
|
||||
echo "-vjsapi install different version from npm of JS-API defined in the package.json"
|
||||
echo "-gnu for gnu"
|
||||
@@ -150,11 +149,6 @@ max_instances(){
|
||||
export MAXINSTANCES=$1
|
||||
}
|
||||
|
||||
disable_control_flow(){
|
||||
echo "====== disable control flow ====="
|
||||
SELENIUM_PROMISE_MANAGER=0
|
||||
}
|
||||
|
||||
version_js_api() {
|
||||
JSAPI_VERSION=$1
|
||||
|
||||
@@ -194,7 +188,6 @@ while [[ $1 == -* ]]; do
|
||||
-l|--lint) lint; shift;;
|
||||
-m|--maxInstances) max_instances $2; shift 2;;
|
||||
-vjsapi) version_js_api $2; shift 2;;
|
||||
-disable-control-flow|--disable-control-flow) disable_control_flow; shift;;
|
||||
-gnu) gnu_mode; shift;;
|
||||
-*) echo "invalid option: $1" 1>&2; show_help; exit 1;;
|
||||
esac
|
||||
|
@@ -8,17 +8,9 @@ rm -rf tmp && mkdir tmp;
|
||||
|
||||
if [[ $TRAVIS_PULL_REQUEST == "false" ]];
|
||||
then
|
||||
|
||||
if [[ $TRAVIS_BRANCH == "development" ]];
|
||||
then
|
||||
./scripts/update-version.sh -gnu -alpha || exit 1;
|
||||
fi
|
||||
|
||||
./scripts/npm-build-all.sh || exit 1;
|
||||
./scripts/npm-build-all.sh -si || exit 1;
|
||||
else
|
||||
./scripts/update-version.sh -gnu -alpha || exit 1;
|
||||
npm install;
|
||||
./scripts/lint.sh || exit 1;
|
||||
./scripts/smart-build.sh -b $TRAVIS_BRANCH -gnu || exit 1;
|
||||
fi;
|
||||
|
||||
|
@@ -12,7 +12,7 @@ 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")";
|
||||
|
||||
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 -m 2 -gnu || 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 -m 3 || exit 1)
|
||||
if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]];
|
||||
then
|
||||
$RUN_CHECK
|
||||
|
@@ -13,7 +13,7 @@ AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/
|
||||
|
||||
node ./scripts/check-env/check-ps-env.js --host "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" || exit 1
|
||||
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 -m 2 -gnu )
|
||||
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 3 )
|
||||
|
||||
if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]];
|
||||
then
|
||||
|
@@ -12,7 +12,7 @@ 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/")";
|
||||
|
||||
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 -m 2 -gnu )
|
||||
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 4 -gnu )
|
||||
|
||||
if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$CONTEXT_ENV" || $TRAVIS_PULL_REQUEST == "false" ]];
|
||||
then
|
||||
|
Reference in New Issue
Block a user