@jahia/cypress 3.14.0 → 3.14.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/ci.build.sh +2 -2
  2. package/ci.startup.sh +11 -21
  3. package/env.Dockerfile +26 -0
  4. package/env.Dockerfile.dockerignore +3 -0
  5. package/env.debug.sh +1 -1
  6. package/env.provision.sh +1 -1
  7. package/env.run.sh +1 -1
  8. package/package.json +3 -3
package/ci.build.sh CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  echo " ci.build.sh == Build test image"
6
6
 
7
- BASEDIR=$(dirname "$0")
7
+ BASEDIR=$(dirname $(readlink -f $0))
8
8
 
9
9
  source $BASEDIR/set-env.sh
10
10
 
@@ -27,4 +27,4 @@ if [ -d ./jahia-module ]; then
27
27
  fi
28
28
 
29
29
 
30
- docker build -t ${TESTS_IMAGE} .
30
+ docker build -f $BASEDIR/env.Dockerfile -t ${TESTS_IMAGE} .
package/ci.startup.sh CHANGED
@@ -3,7 +3,7 @@
3
3
  # This script controls the startup of the container environment
4
4
  # It can be used as an alternative to having docker-compose up started by the CI environment
5
5
 
6
- BASEDIR=$(dirname "$0")
6
+ BASEDIR=$(dirname $(readlink -f $0))
7
7
 
8
8
  source $BASEDIR/set-env.sh
9
9
 
@@ -25,25 +25,15 @@ if [[ -z ${JAHIA_LICENSE} ]]; then
25
25
  fi
26
26
  fi
27
27
 
28
- echo "$(date +'%d %B %Y - %k:%M') [JAHIA_CLUSTER_ENABLED] == Value: ${JAHIA_CLUSTER_ENABLED} =="
28
+ echo "$(date +'%d %B %Y - %k:%M') == Cluster enabled: ${JAHIA_CLUSTER_ENABLED} =="
29
29
  if [[ "${JAHIA_CLUSTER_ENABLED}" == "true" ]]; then
30
- echo "$(date +'%d %B %Y - %k:%M') [JAHIA_CLUSTER_ENABLED] == Starting a cluster of one processing and two browsing =="
31
- if [[ $1 == "notests" ]]; then
32
- docker-compose up -d --renew-anon-volumes mariadb jahia jahia-browsing-a jahia-browsing-b alfresco dockerldap
33
- else
34
- docker-compose up --renew-anon-volumes -d mariadb jahia jahia-browsing-a jahia-browsing-b alfresco dockerldap
35
- docker ps -a
36
- docker stats --no-stream
37
- docker-compose up --abort-on-container-exit cypress
38
- fi
39
- else
40
- echo "$(date +'%d %B %Y - %k:%M') [JAHIA_CLUSTER_ENABLED] == Starting a single processing node (no cluster) =="
41
- if [[ $1 == "notests" ]]; then
42
- docker-compose up -d --renew-anon-volumes mariadb jahia alfresco dockerldap
43
- else
44
- docker-compose up --renew-anon-volumes -d mariadb jahia alfresco dockerldap
45
- docker ps -a
46
- docker stats --no-stream
47
- docker-compose up --abort-on-container-exit cypress
48
- fi
30
+ export CLUSTER_PROFILE="--profile cluster"
31
+ fi
32
+
33
+ echo "$(date +'%d %B %Y - %k:%M') == Starting environment =="
34
+ docker-compose up -d --renew-anon-volumes ${CLUSTER_PROFILE}
35
+ if [[ "$1" != "notests" ]]; then
36
+ docker ps -a
37
+ docker stats --no-stream
38
+ docker-compose up --abort-on-container-exit cypress
49
39
  fi
package/env.Dockerfile ADDED
@@ -0,0 +1,26 @@
1
+ FROM cypress/browsers:node16.16.0-chrome107-ff107-edge
2
+
3
+ ARG MAVEN_VER="3.8.1"
4
+ ARG MAVEN_BASE_URL="https://archive.apache.org/dist/maven/maven-3"
5
+
6
+ RUN apt-get update && apt-get install -y jq
7
+
8
+ RUN adduser --disabled-password jahians
9
+
10
+ USER jahians
11
+ WORKDIR /home/jahians
12
+
13
+ COPY --chown=jahians:jahians package.json yarn.lock /home/jahians/
14
+
15
+ RUN mkdir -p /home/jahians/run-artifacts /home/jahians/results /home/jahians/cypress/plugins
16
+
17
+ #CI=true reduces the verbosity of the installation logs
18
+ RUN CI=true yarn install
19
+
20
+ COPY --chown=jahians:jahians . /home/jahians
21
+
22
+ RUN CI=true /home/jahians/node_modules/.bin/cypress install
23
+
24
+ COPY --chown=jahians:jahians maven.settings.xml /home/jahians/.m2/settings.xml
25
+
26
+ CMD /bin/bash -c /home/jahians/env.run.sh
package/env.Dockerfile.dockerignore ADDED
@@ -0,0 +1,3 @@
1
+ results/
2
+ run-artifacts/
3
+ node_modules
package/env.debug.sh CHANGED
@@ -2,7 +2,7 @@
2
2
  # This script can be used to warmup the environment and execute the tests
3
3
  # It is used by the docker image at startup
4
4
 
5
- BASEDIR=$(dirname "$0")
5
+ BASEDIR=$(dirname $(readlink -f $0))
6
6
 
7
7
  bash $BASEDIR/env.provision.sh
8
8
 
package/env.provision.sh CHANGED
@@ -2,7 +2,7 @@
2
2
  # This script can be used to warmup the environment and execute the tests
3
3
  # It is used by the docker image at startup
4
4
 
5
- BASEDIR=$(dirname "$0")
5
+ BASEDIR=$(dirname $(readlink -f $0))
6
6
 
7
7
  source $BASEDIR/set-env.sh
8
8
 
package/env.run.sh CHANGED
@@ -2,7 +2,7 @@
2
2
  # This script can be used to warmup the environment and execute the tests
3
3
  # It is used by the docker image at startup
4
4
 
5
- BASEDIR=$(dirname "$0")
5
+ BASEDIR=$(dirname $(readlink -f $0))
6
6
 
7
7
  bash $BASEDIR/env.provision.sh
8
8
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jahia/cypress",
3
- "version": "3.14.0",
3
+ "version": "3.14.2",
4
4
  "scripts": {
5
5
  "build": "tsc",
6
6
  "lint": "eslint src -c .eslintrc.json --ext .ts"
@@ -8,8 +8,8 @@
8
8
  "bin": {
9
9
  "ci.build": "./ci.build.sh",
10
10
  "ci.startup": "./ci.startup.sh",
11
- "env.run": "./ci.startup.sh",
12
- "env.debug": "./ci.startup.sh"
11
+ "env.run": "./env.run.sh",
12
+ "env.debug": "./env.debug.sh"
13
13
  },
14
14
  "main": "dist/index.js",
15
15
  "types": "dist/index.d.ts",