@jahia/cypress 3.14.4 → 3.14.6

package/ci.build.sh

@@ -21,8 +21,22 @@ fi
 
 if [ -d ./jahia-module ]; then
   cd jahia-module
-  mvn clean install
-  cp target/*-SNAPSHOT.jar ../artifacts/
+  if [ -e "pom.xml" ]; then
+    mvn clean install
+    cp target/*-SNAPSHOT.jar ../artifacts/
+  elif [ -e "package.json" ]; then
+    rm ./*-SNAPSHOT.tgz
+    yarn install && yarn build && yarn pack
+
+    packages=$(ls *.tgz)
+    for package in $packages
+    do
+      filename=$(basename "$package" .tgz)
+      new_filename="$filename-SNAPSHOT.tgz"
+      mv "$package" "$new_filename"
+    done
+    cp ./*-SNAPSHOT.tgz ../artifacts/
+  fi
   cd ..
 fi
 

package/dist/support/registerSupport.js

@@ -14,6 +14,7 @@ var registerSupport = function () {
     Cypress.Commands.add('executeGroovy', provisioning_1.executeGroovy);
     Cypress.Commands.add('installBundle', provisioning_1.installBundle);
     Cypress.Commands.add('login', login_1.login);
+    Cypress.Commands.add('loginAndStoreSession', login_1.loginAndStoreSession);
     Cypress.Commands.add('logout', logout_1.logout);
     Cypress.Commands.add('repeatUntil', repeatUntil_1.repeatUntil);
     Cypress.Commands.overwrite('fixture', fixture_1.fixture);

package/env.provision.sh

@@ -77,6 +77,15 @@ if [[ -d artifacts/ ]]; then
     echo
     echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Module submitted =="
   done
+
+  # This is done after classic .jar module to ensure NPM modules are installed after engine module
+  for file in $(ls -1 *-SNAPSHOT.tgz | sort -n)
+    do
+      echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Submitting NPM 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
+      echo
+      echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == NPM Module submitted =="
+    done
   cd ..
 fi
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "3.14.4",
+  "version": "3.14.6",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"

package/src/support/registerSupport.ts

@@ -1,6 +1,6 @@
 import {apollo, apolloClient} from './apollo';
 import {executeGroovy, runProvisioningScript, installBundle} from './provisioning';
-import {login} from './login';
+import {login, loginAndStoreSession} from './login';
 import {logout} from './logout';
 import {fixture} from './fixture';
 import {repeatUntil} from './repeatUntil';
@@ -14,6 +14,7 @@ export const registerSupport = (): void => {
     Cypress.Commands.add('installBundle', installBundle);
 
     Cypress.Commands.add('login', login);
+    Cypress.Commands.add('loginAndStoreSession', loginAndStoreSession);
     Cypress.Commands.add('logout', logout);
     Cypress.Commands.add('repeatUntil', repeatUntil);