Merge pull request #5120 from nightwing/ci

update node used in ci
ajaxorg · Apr 7, 2023 · ed729aa · ed729aa
2 parents a1a160c + 37ac29e
commit ed729aa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -52,7 +52,7 @@ jobs:
         fi
     # - run: npm run lint
     - run: node_modules/.bin/tsc --noImplicitAny --strict --noUnusedLocals --noImplicitReturns --noUnusedParameters --noImplicitThis ace.d.ts
-    - uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v3
       with:
         file: ./coverage/coverage.json
         flags: unittests

diff --git a/src/mouse/mouse_handler_test.js b/src/mouse/mouse_handler_test.js
@@ -33,7 +33,7 @@ var WheelEvent = function(opts) {
 };
 
 function sendTouchEvent(type, opts, editor) {
-    var e = new window.Event("touch" + type, {bubbles: true, cancelable: true});
+    var e = new window.CustomEvent("touch" + type, {bubbles: true, cancelable: true});
     Object.defineProperties(e, Object.getOwnPropertyDescriptors(opts));
     editor.container.dispatchEvent(e);
 }

diff --git a/src/test/mockdom.js b/src/test/mockdom.js
@@ -830,14 +830,14 @@ exports.load = function() {
     if (typeof global == "undefined") return;
     window.window = global;
     Object.keys(window).forEach(function(i) {
-        if (!global[i]) {
-            addedProperties.push(i);
-            global.__defineGetter__(i, function() {
-                return window[i];
-            });
-            global.__defineSetter__(i, function() {
-            });
-        }
+        var desc = Object.getOwnPropertyDescriptor(global, i);
+        addedProperties.push({name: i, desc: desc});
+        global.__defineGetter__(i, function() {
+            return window[i];
+        });
+        global.__defineSetter__(i, function() {
+            console.log("attempt to set " + i);
+        });
     });
 };
 
@@ -894,7 +894,10 @@ exports.unload = function() {
     var cache = req("module")._cache;
     delete cache[__filename];
     addedProperties.forEach(function(i) {
-        delete global[i];
+        delete global[i.name];
+        if (i.desc) {
+            Object.defineProperty(global, i.name, i.desc);
+        }
     });
 };