enable ftest back

nuxeo · Mar 1, 2024 · 6467be2 · 6467be2
1 parent 2dec4cf
commit 6467be2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/ci/Jenkinsfiles/build.groovy b/ci/Jenkinsfiles/build.groovy
@@ -54,7 +54,7 @@ Closure buildUnitTestStage(env) {
 
 pipeline {
   agent {
-    label 'jenkins-nuxeo-package-lts-2023'
+    label 'jenkins-nuxeo-package-lts-2023-node-18'
   }
   options {
     buildDiscarder(logRotator(daysToKeepStr: '60', numToKeepStr: '60', artifactNumToKeepStr: '5'))
@@ -118,6 +118,7 @@ pipeline {
             container('playwright') {
               nxWithGitHubStatus(context: 'utests/frontend') {
                 dir('nuxeo-coldstorage-web') {
+                  sh 'npm install'
                   sh 'npm install --no-save playwright'
                   sh 'npx playwright install --with-deps'
                   sh 'npm run test'
@@ -163,8 +164,6 @@ pipeline {
             }
           }
           nxWithGitHubStatus(context: 'ftests') {
-            echo "Functional tests are disabled (https://jira.nuxeo.com/browse/WEBUI-1260 and https://jira.nuxeo.com/browse/WEBUI-1252)"
-            /*
             script {
               def testNamespace = "${CURRENT_NAMESPACE}-coldstorage-${BRANCH_NAME}-${BUILD_NUMBER}-ftests".replaceAll('\\.', '-').toLowerCase()
               def nuxeoParentVersion = readMavenPom().getParent().getVersion()
@@ -179,7 +178,6 @@ pipeline {
                 }
               }
             }
-            */
           }
         }
       }

diff --git a/nuxeo-coldstorage-web/build.xml b/nuxeo-coldstorage-web/build.xml
@@ -25,10 +25,10 @@ limitations under the License.
     <exec executable="node" failonerror="true" outputproperty="node-version">
       <arg value="--version" />
     </exec>
-    <fail message="NodeJS version must be 14">
+    <fail message="NodeJS version must be 18">
       <condition>
         <not>
-          <contains string="${node-version}" substring="v14" />
+          <contains string="${node-version}" substring="v18" />
         </not>
       </condition>
     </fail>

diff --git a/nuxeo-coldstorage-web/ftest/features/step_definitions/coldstorage.js b/nuxeo-coldstorage-web/ftest/features/step_definitions/coldstorage.js
@@ -1,4 +1,5 @@
 import Nuxeo from 'nuxeo';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { When, Then, Before } from '@cucumber/cucumber';
 
 Before(() => {

diff --git a/nuxeo-coldstorage-web/package.json b/nuxeo-coldstorage-web/package.json
@@ -4,8 +4,7 @@
   "author": "Nuxeo",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cucumber/cucumber": "^7.0.0",
-    "@nuxeo/nuxeo-web-ui-ftest": "~3.1.0-rc.75",
+    "@nuxeo/nuxeo-web-ui-ftest": "3.1.6-rc.008",
     "expect-webdriverio": "3.3.1",
     "@open-wc/eslint-config": "^0.3.0",
     "@esm-bundle/chai": "^4.1.5",

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo</groupId>
     <artifactId>nuxeo-parent</artifactId>
-    <version>2023.4.13</version>
+    <version>2023.4.23</version>
   </parent>
 
   <groupId>org.nuxeo.coldstorage</groupId>