[DLT-1110] Upgrade node v14 -> v23

ORNL · Jan 22, 2025 · fb8b93d · fb8b93d
1 parent 82715f0
commit fb8b93d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/.gitlab/stage_unit.yml b/.gitlab/stage_unit.yml
@@ -44,9 +44,9 @@ run-ws-unit-job:
     - echo "#!/bin/bash" > run_web.sh
     - echo "docker run \\" >> run_web.sh
     - echo "--name \"ws-${BRANCH_LOWER}-${INTERMEDIATE_LAYER_NAME}-${CI_COMMIT_SHORT_SHA}-${random_string}\" \\" >> run_web.sh
-    - echo "-e NVM_INC=/opt/datafed/dependencies/nvm/versions/node/v14.21.3/include/node \\" >> run_web.sh
-    - echo "-e PATH=/opt/datafed/dependencies/nvm/versions/node/v14.21.3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \\" >> run_web.sh
-    - echo "-e NVM_INC=/opt/datafed/dependencies/nvm/versions/node/v14.21.3/include/node \\" >> run_web.sh
+    - echo "-e NVM_INC=/opt/datafed/dependencies/nvm/versions/node/v23.6.1/include/node \\" >> run_web.sh
+    - echo "-e PATH=/opt/datafed/dependencies/nvm/versions/node/v23.6.1bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \\" >> run_web.sh
+    - echo "-e NVM_INC=/opt/datafed/dependencies/nvm/versions/node/v23.6.1/include/node \\" >> run_web.sh
     - echo "-e DATAFED_GLOBUS_APP_SECRET=\"$CI_DATAFED_GLOBUS_APP_SECRET\" \\" >> run_web.sh
     - echo "-e DATAFED_GLOBUS_APP_ID=\"$CI_DATAFED_GLOBUS_APP_ID\" \\" >> run_web.sh
     - echo "-e DATAFED_ZEROMQ_SESSION_SECRET=\"$CI_DATAFED_ZEROMQ_SESSION_SECRET\" \\" >> run_web.sh

diff --git a/scripts/dependency_versions.sh b/scripts/dependency_versions.sh
@@ -12,7 +12,7 @@ DATAFED_LIBZMQ_VERSION="4.3.4"
 DATAFED_LIB_LIBZMQ_VERSION="5.2.4"
 DATAFED_LIB_ZMQCPP_VERSION="4.10.0"
 DATAFED_NVM_VERSION="v0.39.7"
-DATAFED_NODE_VERSION="v14.21.3"
+DATAFED_NODE_VERSION="v23.6.1"
 DATAFED_NVM_VERSION="v0.39.7"
 # Git tag
 DATAFED_PROTOBUF_VERSION="25.2"

diff --git a/web/package.json.in b/web/package.json.in
@@ -18,7 +18,7 @@
     "sanitize-html": "^2.11.0"
   },
   "scripts": {
-    "test": "mocha"
+    "test": "mocha --config .mocharc.cjs"
   },
   "repository": {
     "type": "git",

diff --git a/web/test/components/transfer/transfer-dialog-controller.test.js b/web/test/components/transfer/transfer-dialog-controller.test.js
@@ -1,4 +1,5 @@
-import { expect, sinon } from "../../setup.js";
+import { expect } from "chai";
+import sinon from "sinon";
 import { createMockServices, setupJQueryMocks } from "../../fixtures/transfer-fixtures.js";
 import { TransferDialogController } from "../../../static/components/transfer/transfer-dialog-controller.js";
 import { TransferEndpointManager } from "../../../static/components/transfer/transfer-endpoint-manager.js";

diff --git a/web/test/components/transfer/transfer-endpoint-manager.test.js b/web/test/components/transfer/transfer-endpoint-manager.test.js
@@ -1,4 +1,5 @@
-import { expect, sinon } from "../../setup.js";
+import { expect } from "chai";
+import sinon from "sinon";
 import { createMockServices, setupJQueryMocks } from "../../fixtures/transfer-fixtures.js";
 import { TransferEndpointManager } from "../../../static/components/transfer/transfer-endpoint-manager.js";
 

diff --git a/web/test/components/transfer/transfer-ui-manager.test.js b/web/test/components/transfer/transfer-ui-manager.test.js
@@ -1,4 +1,5 @@
-import { expect, sinon } from "../../setup.js";
+import { expect } from "chai";
+import sinon from "sinon";
 import { createMockServices, setupJQueryMocks } from "../../fixtures/transfer-fixtures.js";
 import { TransferUIManager } from "../../../static/components/transfer/transfer-ui-manager.js";
 import { TransferMode } from "../../../static/models/transfer-model.js";

diff --git a/web/test/setup.js b/web/test/setup.js
@@ -21,11 +21,11 @@ const jqueryCode = readFileSync(jqueryPath, "utf-8");
  */
 function setupTestDOM() {
     const dom = new JSDOM(
-        `<!DOCTYPE html>                                                                                                                                             
-          <html lang="">                                                                                                                                                      
-              <body>                                                                                                                                                  
-                  <div id="transfer-dialog"></div>                                                                                                                    
-              </body>                                                                                                                                                 
+        `<!DOCTYPE html>
+          <html lang="">
+              <body>
+                  <div id="transfer-dialog"></div>
+              </body>
           </html>`,
         {
             url: "http://localhost",
@@ -37,8 +37,6 @@ function setupTestDOM() {
     // Make DOM elements available globally
     global.window = dom.window;
     global.document = dom.window.document;
-    global.navigator = dom.window.navigator;
-    global.location = dom.window.location;
     global.HTMLElement = window.HTMLElement;
     global.Element = window.Element;
     global.Node = window.Node;