@jahia/cypress 6.4.2 → 6.4.4

package/dist/plugins/env.js

@@ -5,15 +5,18 @@ var env = function (on, config) {
         console.warn('No environment set, will use default values');
         config.baseUrl = 'http://localhost:8080';
         config.env.JAHIA_URL = 'http://localhost:8080';
+        config.env.JAHIA_PROCESSING_URL = 'http://localhost:8080';
         config.env.SUPER_USER_PASSWORD = 'root1234';
     }
     else {
         console.log('Setting environment');
         config.baseUrl = process.env.JAHIA_URL;
         config.env.JAHIA_URL = process.env.JAHIA_URL;
+        config.env.JAHIA_PROCESSING_URL = process.env.JAHIA_PROCESSING_URL;
         config.env.SUPER_USER_PASSWORD = process.env.SUPER_USER_PASSWORD;
     }
     console.log('JAHIA_URL =', config.env.JAHIA_URL);
+    console.log('JAHIA_PROCESSING_URL =', config.env.JAHIA_PROCESSING_URL);
     console.log('SUPER_USER_PASSWORD =', config.env.SUPER_USER_PASSWORD);
     return config;
 };

package/env.provision.sh

@@ -6,6 +6,13 @@ BASEDIR=$(dirname $(readlink -f $0))
 
 source $BASEDIR/set-env.sh
 
+if [[ -z "$JAHIA_PROCESSING_URL" ]]; then
+  echo "JAHIA_PROCESSING_URL not set, defaulting to $JAHIA_URL"
+  export JAHIA_PROCESSING_URL="$JAHIA_URL"
+else
+  echo "JAHIA_PROCESSING_URL is already set ($JAHIA_PROCESSING_URL)"
+fi
+
 #!/usr/bin/env bash
 START_TIME=$SECONDS
 
@@ -17,6 +24,7 @@ echo " JAHIA_IMAGE: ${JAHIA_IMAGE}"
 echo " JAHIA_CLUSTER_ENABLED: ${JAHIA_CLUSTER_ENABLED}"
 echo " MODULE_ID: ${MODULE_ID}"
 echo " JAHIA_URL: ${JAHIA_URL}"
+echo " JAHIA_PROCESSING_URL: ${JAHIA_PROCESSING_URL}"
 echo " JAHIA_HOST: ${JAHIA_HOST}"
 echo " JAHIA_PORT: ${JAHIA_PORT}"
 echo " JAHIA_USERNAME: ${JAHIA_USERNAME}"
@@ -30,9 +38,9 @@ echo "$(date +'%d %B %Y - %k:%M') ==  Using yarn version: $(yarn -v)"
 
 echo "$(date +'%d %B %Y - %k:%M') ==  Waiting for Jahia to startup"
 
-while [[ $(curl -s -o /dev/null -w ''%{http_code}'' ${JAHIA_URL}/cms/login) -ne 200 ]];
+while [[ $(curl -s -o /dev/null -w ''%{http_code}'' ${JAHIA_PROCESSING_URL}/cms/login) -ne 200 ]];
 do
-  echo "$(date +'%d %B %Y - %k:%M') == Jahia is not available at ${JAHIA_URL}/cms/login, will try in 5 seconds"
+  echo "$(date +'%d %B %Y - %k:%M') == Jahia is not available at ${JAHIA_PROCESSING_URL}/cms/login, will try in 5 seconds"
   ELAPSED_TIME=$(($SECONDS - $START_TIME))
   if [[ ELAPSED_TIME -gt 300 ]]; then
     echo "$(date +'%d %B %Y - %k:%M') == Exiting, Jahia failed to start after 300 seconds"
@@ -60,7 +68,7 @@ sed -i -e "s/NEXUS_USERNAME/$(echo ${NEXUS_USERNAME} | sed -e 's/\\/\\\\/g; s/\/
 sed -i -e "s/NEXUS_PASSWORD/$(echo ${NEXUS_PASSWORD} | sed -e 's/\\/\\\\/g; s/\//\\\//g; s/&/\\\&/g')/g" ./run-artifacts/${MANIFEST}
 
 echo "$(date +'%d %B %Y - %k:%M') == Executing manifest: ${MANIFEST} =="
-curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_URL}/modules/api/provisioning --form script="@./run-artifacts/${MANIFEST};type=text/yaml" $(find assets -type f | sed -E 's/^(.+)$/--form file=\"@\1\"/' | xargs)
+curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_PROCESSING_URL}/modules/api/provisioning --form script="@./run-artifacts/${MANIFEST};type=text/yaml" $(find assets -type f | sed -E 's/^(.+)$/--form file=\"@\1\"/' | xargs)
 echo
 if [[ $? -eq 1 ]]; then
   echo "$(date +'%d %B %Y - %k:%M') == PROVISIONING FAILURE - EXITING SCRIPT, NOT RUNNING THE TESTS"
@@ -76,7 +84,7 @@ if [[ -d artifacts/ ]]; then
   for file in $(ls -1 *-SNAPSHOT.jar | sort -n)
   do
     echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Submitting module from: $file =="
-    curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_URL}/modules/api/provisioning --form script='[{"installAndStartBundle":"'"$file"'", "forceUpdate":true}]' --form file=@$file
+    curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_PROCESSING_URL}/modules/api/provisioning --form script='[{"installOrUpgradeBundle":"'"$file"'", "forceUpdate":true}]' --form file=@$file
     echo
     echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Module submitted =="
   done
@@ -85,7 +93,7 @@ if [[ -d artifacts/ ]]; then
   for file in $(ls -1 *-SNAPSHOT.tgz | sort -n)
     do
       echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Submitting Javascript module from: $file =="
-      curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_URL}/modules/api/provisioning --form script='[{"installAndStartBundle":"'"$file"'", "forceUpdate":true}]' --form file=@$file
+      curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_PROCESSING_URL}/modules/api/provisioning --form script='[{"installOrUpgradeBundle":"'"$file"'", "forceUpdate":true}]' --form file=@$file
       echo
       echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Javascript Module submitted =="
     done
@@ -97,7 +105,7 @@ if [[ -d scripts/ ]]; then
   for file in $(ls -1 script-* | sort -n)
   do
     echo "$(date +'%d %B %Y - %k:%M') [SCRIPT] == Submitting script: $file =="
-    curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_URL}/modules/api/provisioning --form script='[{"executeScript":"'"$file"'"}]' --form file=@$file
+    curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_PROCESSING_URL}/modules/api/provisioning --form script='[{"executeScript":"'"$file"'"}]' --form file=@$file
     echo "$(date +'%d %B %Y - %k:%M') [SCRIPT] == Script executed =="
   done
   cd ..

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "6.4.2",
+  "version": "6.4.4",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts --max-warnings=0"
@@ -14,6 +14,10 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Jahia/jahia-cypress.git"
+  },
   "devDependencies": {
     "@jahia/eslint-config": "^1.1.0",
     "@typescript-eslint/eslint-plugin": "^4.29.3",
@@ -34,5 +38,5 @@
     "graphql": "^15.5.0",
     "graphql-tag": "^2.11.0"
   },
-  "packageManager": "yarn@4.5.0"
-}
+  "packageManager": "yarn@4.12.0"
+}

package/src/plugins/env.ts

@@ -3,15 +3,18 @@ const env = (on:Cypress.PluginEvents, config: Cypress.PluginConfigOptions):Cypre
         console.warn('No environment set, will use default values');
         config.baseUrl = 'http://localhost:8080';
         config.env.JAHIA_URL = 'http://localhost:8080';
+        config.env.JAHIA_PROCESSING_URL = 'http://localhost:8080';
         config.env.SUPER_USER_PASSWORD = 'root1234';
     } else {
         console.log('Setting environment');
         config.baseUrl = process.env.JAHIA_URL;
         config.env.JAHIA_URL = process.env.JAHIA_URL;
+        config.env.JAHIA_PROCESSING_URL = process.env.JAHIA_PROCESSING_URL;
         config.env.SUPER_USER_PASSWORD = process.env.SUPER_USER_PASSWORD;
     }
 
     console.log('JAHIA_URL =', config.env.JAHIA_URL);
+    console.log('JAHIA_PROCESSING_URL =', config.env.JAHIA_PROCESSING_URL);
     console.log('SUPER_USER_PASSWORD =', config.env.SUPER_USER_PASSWORD);
 
     return config;