[ACA-4306] Testing - Add form widget ids in the SIMPLEAPP resources file (#6806)

* [ACA-4306] Testing - Add form widget ids in the SIMPLEAPP resources file * downgrade nrwl workspace version * Use the PR branch name and terminate * Handle the error * Revert downgrade nrwl workspace * Remove the useless check on rebase and raise the exit 1 * Remove the script * Use the HEAD and create a new variable for commit sha Co-authored-by: Maurizio Vitale <maurizio.vitale@alfresco.com>
2025-05-19 17:14:57 +00:00 · 2021-03-22 17:44:55 +00:00 · 2021-03-22 17:44:55 +00:00 · 2d257ea092
commit 2d257ea092
parent 4e94176536
13 changed files with 33 additions and 52 deletions
--- a/lib/testing/src/lib/process-services-cloud/resources/resources.json
+++ b/lib/testing/src/lib/process-services-cloud/resources/resources.json
@ -136,7 +136,17 @@
        "name": "form-with-single-input"
      },
      "tabVisibilityVars": {
-        "name": "tabvisibilitywithvars"
+        "name": "tabvisibilitywithvars",
+        "tabs": {
+          "tabWithFields": "tabWithFields",
+          "tabVarVar": "tabBasicVarVar",
+          "tabBasicVarField": "tabBasicVarField"
+        },
+        "widgets": {
+          "textOneId": "TextOne",
+          "textThreeId": "TextThree",
+          "numberOneId": "NumberOne"
+        }
      },
      "usertaskform": {
        "name": "usertaskform"
@ -145,7 +155,11 @@
        "name": "dropdownform"
      },
      "formVisibility": {
-        "name": "form-visibility"
+        "name": "form-visibility",
+        "widgets": {
+          "textOneId": "Text",
+          "textTwoId": "Multilinetext"
+        }
      },
      "multilingualform": {
        "name": "multilingualform"
--- a/scripts/ci/job_hooks/before_install.sh
+++ b/scripts/ci/job_hooks/before_install.sh
@ -16,7 +16,7 @@ export NODE_OPTIONS="--max_old_space_size=30000"

 # Settings for Nx ---------------------------------------------------------------------
 export BASE_HASH="$(git wmerge-base origin/$BRANCH_NAME HEAD)"
-export HEAD_HASH=${TRAVIS_PULL_REQUEST_SHA:-${TRAVIS_COMMIT}}
+export HEAD_HASH="HEAD"

 if [ "${TRAVIS_EVENT_TYPE}" == "push" ]; then
    echo "push"
--- a/scripts/git-util/check-branch-updated.sh
+++ b/scripts/git-util/check-branch-updated.sh
@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-eval BRANCH_NAME=""
-
-branch_name(){
-    BRANCH_NAME=$1
-}
-
-show_help() {
-    echo "Usage: check-branch-updated.sh"
-    echo ""
-    echo "-b branch name"
-}
-
-while [[ $1  == -* ]]; do
-    case "$1" in
-      -b)  branch_name $2; shift 2;;
-      -*) echo "invalid option: $1" 1>&2; show_help; exit 0;;
-    esac
-done
-
-if [[ "$BRANCH_NAME" == "" ]]
-then
-    echo "The branch name is mandatory"
-    exit 0
-fi
-
-hash1=$(git show-ref --heads -s develop)
-hash2=$(git merge-base develop $BRANCH_NAME)
-[ "${hash1}" = "${hash2}" ] && echo "Branch up to date" || { echo "Branch needs to be rebeased"; exit 1; }
-
-echo "Develop branch HEAD sha " $hash1
-echo "$BRANCH_NAME branch HEAD sha " $hash2
--- a/scripts/travis/e2e/content-services-e2e.sh
+++ b/scripts/travis/e2e/content-services-e2e.sh
@ -11,8 +11,8 @@ export AUTH_TYPE='BASIC'

 if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then
    echo "Calculate affected e2e $BASE_HASH $HEAD_HASH"
-    ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1;
-    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+    echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain"
+    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
    echo "Affected libs ${AFFECTED_LIBS}"
    AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")";
    echo "Affected e2e ${AFFECTED_E2E}"
--- a/scripts/travis/e2e/core-e2e.sh
+++ b/scripts/travis/e2e/core-e2e.sh
@ -13,8 +13,8 @@ export AUTH_TYPE='OAUTH'

 if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then
    echo "Calculate affected e2e $BASE_HASH $HEAD_HASH"
-    ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1;
-    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+    echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain"
+    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
    echo "Affected libs ${AFFECTED_LIBS}"
    AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")";
    echo "Affected e2e ${AFFECTED_E2E}"
--- a/scripts/travis/e2e/insights-e2e.sh
+++ b/scripts/travis/e2e/insights-e2e.sh
@ -11,9 +11,9 @@ cd $DIR/../../../

 if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then
    echo "Calculate affected e2e $BASE_HASH $HEAD_HASH"
-    ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1;
+    echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain"
    echo "Affected libs ${AFFECTED_LIBS}"
-    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
    echo "Affected e2e ${AFFECTED_E2E}"
 fi;

--- a/scripts/travis/e2e/process-services-cloud-e2e.sh
+++ b/scripts/travis/e2e/process-services-cloud-e2e.sh
@ -11,8 +11,8 @@ export AUTH_TYPE="OAUTH"

 if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then
    echo "Calculate affected e2e $BASE_HASH $HEAD_HASH"
-    ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1;
-    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+    echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain"
+    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
    echo "Affected libs ${AFFECTED_LIBS}"
    AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")";
    echo "Affected e2e ${AFFECTED_E2E}"
--- a/scripts/travis/e2e/process-services-e2e.sh
+++ b/scripts/travis/e2e/process-services-e2e.sh
@ -11,8 +11,8 @@ echo "Start process services e2e"

 if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then
    echo "Calculate affected e2e $BASE_HASH $HEAD_HASH"
-    ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1;
-    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+    echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain"
+    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
    echo "Affected libs ${AFFECTED_LIBS}"
    AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")";
    echo "Affected e2e ${AFFECTED_E2E}"
--- a/scripts/travis/e2e/search-e2e.sh
+++ b/scripts/travis/e2e/search-e2e.sh
@ -12,8 +12,8 @@ export AUTH_TYPE='BASIC'

 if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ];then
    echo "Calculate affected e2e $BASE_HASH $HEAD_HASH"
-    ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1;
-    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+    echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain"
+    AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
    echo "Affected libs ${AFFECTED_LIBS}"
    AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$CONTEXT_ENV")";
    echo "Affected e2e ${AFFECTED_E2E}"
--- a/scripts/travis/unit-test/content.sh
+++ b/scripts/travis/unit-test/content.sh
@ -10,7 +10,7 @@ echo "================== AFFECTED_LIBS  ${AFFECTED_LIBS} ==================="

 echo "================== content-services unit ==================="

-AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
 if [[ $AFFECTED_LIBS =~ "content-services" ||  "${TRAVIS_EVENT_TYPE}" == "push"  ]];
 then
    ng test content-services --watch=false || exit 1;
--- a/scripts/travis/unit-test/core-extension.sh
+++ b/scripts/travis/unit-test/core-extension.sh
@ -5,7 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/../../../


-AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"

 echo "================== AFFECTED_LIBS  ${AFFECTED_LIBS} ==================="

--- a/scripts/travis/unit-test/process-cloud.sh
+++ b/scripts/travis/unit-test/process-cloud.sh
@ -7,7 +7,7 @@ command="concurrently "
 cd $DIR/../../../


-AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"

 echo "================== AFFECTED_LIBS  ${AFFECTED_LIBS} ==================="

--- a/scripts/travis/unit-test/process.sh
+++ b/scripts/travis/unit-test/process.sh
@ -7,7 +7,7 @@ command="concurrently "
 cd $DIR/../../../


-AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain)"
+AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"

 echo "================== AFFECTED_LIBS  ${AFFECTED_LIBS} ==================="