Upgraded Node & npm in /testing

enonic · Dec 22, 2023 · d33293e · d33293e
1 parent 491ced5
commit d33293e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/testing/build.gradle b/testing/build.gradle
@@ -1,4 +1,5 @@
 import com.enonic.uitest.server.ServerInstance
+import org.codehaus.groovy.runtime.GStringImpl
 
 plugins {
     id 'java'
@@ -18,30 +19,30 @@ configurations {
 }
 
 ext {
-    unpackDir = "$buildDir/install"
-    distroDir = "$unpackDir/enonic-xp-generic-$version"
-    deployDir = "$distroDir/home/deploy"
-    appDir = "$projectDir/test-applications"
-    xpHome = "$distroDir/home"
-    configDir = "$xpHome/config"
+    unpackDir = "$buildDir/install" as GStringImpl
+    distroDir = "$unpackDir/enonic-xp-generic-$version" as GStringImpl
+    deployDir = "$distroDir/home/deploy" as GStringImpl
+    appDir = "$projectDir/test-applications" as GStringImpl
+    xpHome = "$distroDir/home" as GStringImpl
+    configDir = "$xpHome/config" as GStringImpl
     xpServer = new ServerInstance()
     appName = "app-applications"
-    appFile = "$distroDir/system/40/${appName}-${version}.jar"
-    appUrl = project.hasProperty( 'appUrl' ) ? appUrl : "file:///$projectDir/../build/libs/${appName}.jar"
+    appFile = "$distroDir/system/40/${appName}-${version}.jar" as GStringImpl
+    appUrl = project.hasProperty( 'appUrl' ) ? appUrl : "file:///$projectDir/../build/libs/${appName}.jar" as GStringImpl
 }
 
 dependencies {
     distro "com.enonic.xp:enonic-xp-generic:$version@zip"
 }
 
-task unpackDistro( type: Copy ) {
+tasks.register( 'unpackDistro', Copy ) {
     from {
         configurations.distro.collect { zipTree( it ) }
     }
     into file( unpackDir )
 }
 
-task copyConfig( type: Copy ) {
+tasks.register( 'copyConfig', Copy ) {
     println "$appDir/common-config"
     from "$appDir/common-config"
     include '**.*.cfg'
@@ -50,65 +51,67 @@ task copyConfig( type: Copy ) {
     mustRunAfter unpackDistro
 }
 
-task copyApps( type: Copy ) {
+tasks.register( 'copyApps', Copy ) {
     println appDir
     from file( appDir )
     include '*.jar'
     into file( deployDir )
     mustRunAfter unpackDistro
 }
 
-task deployApp( type: DefaultTask ) {
+tasks.register( 'deployApp', DefaultTask ) {
     outputs.files( appFile )
     outputs.upToDateWhen { false }
     doLast {
-        def f = new File( appFile )
+        def f = new File(appFile as String)
         println "Deleting  ${appFile}. Exists ${f.exists()}"
 
         f.delete()
 
         println "Copying from ${appUrl} to ${appFile}"
-        new URL( appUrl ).withInputStream { i -> f.withOutputStream { it << i } }
+        new URL(appUrl as String).withInputStream { i -> f.withOutputStream { it << i } }
     }
     mustRunAfter unpackDistro
 }
 
-task startServer( dependsOn: unpackDistro ) {
+tasks.register( 'startServer' ) {
+    dependsOn unpackDistro
     doLast {
         xpServer.installDir = file( distroDir )
         xpServer.start()
     }
 }
 
-task stopServer {
+tasks.register( 'stopServer') {
     doLast {
         xpServer.stop()
     }
 }
 
-task cleanup(type: Delete) {
+tasks.register( 'cleanup', Delete ) {
     delete './build/reports/allure'
 }
 
-task generateReportAndStopServer( type: NpmTask ) {
+tasks.register( 'generateReportAndStopServer', NpmTask ) {
     args = ['run-script', 'allure-report']
     finalizedBy cleanup
     finalizedBy stopServer
 }
 
-
-task testAppFirefox( type: NpmTask,
-                                 dependsOn: [npmInstall, unpackDistro, copyConfig, copyApps, deployApp, startServer] ) {
+tasks.register( 'testAppFirefox', NpmTask ) {
+    dependsOn: [npmInstall, unpackDistro, copyConfig, copyApps, deployApp, startServer]
     args = ['run-script', 'test:firefox']
     finalizedBy generateReportAndStopServer
 }
 
-task w_testAppChrome( type: NpmTask,
-                    dependsOn: [npmInstall, unpackDistro, copyConfig, copyApps, deployApp, startServer] ) {
+tasks.register( 'w_testAppChrome', NpmTask) {
+    dependsOn: [npmInstall, unpackDistro, copyConfig, copyApps, deployApp, startServer]
     args = ['run-script', 'test_apps:wdio_chrome']
     finalizedBy generateReportAndStopServer
 }
-task w_testAppChromeLocal( type: NpmTask, dependsOn: [npmInstall] ) {
+
+tasks.register( 'w_testAppChromeLocal', NpmTask ) {
+    dependsOn: [npmInstall]
     args = ['run-script', 'test_apps:wdio_chrome']
 }
 

diff --git a/testing/package-lock.json b/testing/package-lock.json
diff --git a/testing/package.json b/testing/package.json
@@ -22,7 +22,7 @@
     "@wdio/concise-reporter": "^8.26.3"
   },
   "engines": {
-    "node": ">= 18.12.1",
-    "npm": ">= 8.19.2"
+    "node": ">= 20.10.0",
+    "npm": ">= 10.2.3"
   }
 }