xxx

Author: nightwing

.github/workflows/nodejs.yml

@@ -31,8 +31,9 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm i
+    - run: npm i && npm i mocha c8
     - run: npm run cover
+    - run: npx c8 --reporter=lcov  --reporter=text-summary  mocha './src/**/*_test.js'  --exit -p
     # run linter
     - run: |
         set -x;

src/ext/command_bar_test.js

@@ -585,7 +585,8 @@ module.exports = {
         tooltipVisibilityCheck(true);
         commandBarTooltip.detach();
     },
-    "test: does not display if the tooltip does not fit into the screen": function() {
+    "test: does not display if the tooltip does not fit into the screen": async function() {
+        await lang.sleep(0);
         createTooltip();
 
         var testString = "a".repeat(100) +

src/ext/diff/base_diff_view.js

@@ -435,13 +435,14 @@ class BaseDiffView {
      */
     $initWidgets(editor) {
         var session = editor.session;
+        if (!session) return;
         if (!session.widgetManager) {
             session.widgetManager = new LineWidgets(session);
             session.widgetManager.attach(editor);
         }
-        editor.session.lineWidgets = [];
-        editor.session.widgetManager.lineWidgets = [];
-        editor.session.$resetRowCache(0);
+        session.lineWidgets = [];
+        session.widgetManager.lineWidgets = [];
+        session.$resetRowCache(0);
     }
 
     /**
@@ -598,7 +599,7 @@ class BaseDiffView {
         if (this.savedOptionsB &&this.savedOptionsB.customScrollbar) {
             this.$resetDecorators(this.editorB.renderer);
         }
-        
+        clearTimeout(this.$onInputTimer);
     }
 
     $removeLineWidgets(session) {

src/ext/diff/inline_diff_view.js

@@ -140,7 +140,7 @@ class InlineDiffView extends BaseDiffView {
 
     selectEditor(editor) {
         if (editor == this.activeEditor) {
-            this.otherEditor.selection.clearSelection();
+            this.otherEditor.selection?.clearSelection();
             this.activeEditor.textInput.setHost(this.activeEditor);
             this.activeEditor.setStyle("ace_diff_other", false);
             this.cursorLayer.element.remove();
@@ -174,7 +174,7 @@ class InlineDiffView extends BaseDiffView {
 
     removeBracketHighlight(editor) {
         var session = editor.session;
-        if (session.$bracketHighlight) {
+        if (session && session.$bracketHighlight) {
             session.$bracketHighlight.markerIds.forEach(function(id) {
                 session.removeMarker(id);
             });
@@ -312,10 +312,10 @@ class InlineDiffView extends BaseDiffView {
     }
 
     $detachSessionHandlers(editor, marker) {
-        editor.session.removeMarker(marker.id);
-        editor.selection.off("changeCursor", this.onSelect);
-        editor.selection.off("changeSelection", this.onSelect);
-        editor.session.off("changeFold", this.onChangeFold);
+        editor.session?.removeMarker(marker.id);
+        editor.selection?.off("changeCursor", this.onSelect);
+        editor.selection?.off("changeSelection", this.onSelect);
+        editor.session?.off("changeFold", this.onChangeFold);
     }
 
     $attachEventHandlers() {

src/ext/static_highlight_test.js

@@ -12,11 +12,16 @@ var config = require("../config");
 module.exports = {
     timeout: 10000,
 
-    "test loading in node": function() {
-        require("../test/mockdom").unload();
-        if (typeof process != "undefined")
-            assert.equal(typeof window, "undefined");
-        require("../ace");
+    "test loading in node": function(done) {
+        if (typeof process === "undefined") {
+            return done();
+        }
+        var req = require;
+        req("child_process").execFile(process.execPath, ["-p", "require('../ace').version"], function(err, stdout, stderr) {
+            assert.ok(!err, "Failed to load ace in node: " + err);
+            assert.equal(stdout.trim(), config.version);
+            done();
+        });
     },
 
     "test simple snippet": function() {

src/mode/_test/highlight_rules_test.js

@@ -28,7 +28,7 @@ function modeList() {
 function checkModes() {
     var snippets = {};
     modeList().forEach(function(modeName, i) {
-        console.log(padNumber(i+1, 3) + ") check: \u001b[33m" + modeName + "\u001b[0m");
+        silent || console.log(padNumber(i+1, 3) + ") check: \u001b[33m" + modeName + "\u001b[0m");
         try {
             var Mode = require("../" + modeName).Mode;
         } catch(e) {
@@ -145,7 +145,7 @@ function checkModes() {
             editor.setSession(session);
             editor.execCommand("insertstring", "(");
             if (editor.getValue() != "()")
-                return console.log("() not paired in " + modeName);
+                return silent || console.log("() not paired in " + modeName);
             editor.execCommand("insertstring", "(");
             if (editor.getValue() != "(())")
                 die("(()) not paired in " + modeName);
@@ -211,7 +211,7 @@ function generateTestData(names, force) {
             console.warn("Can't load mode :" + modeName, p, e);
             return;
         }
-        console.log(modeName);
+        silent || console.log(modeName);
         var tokenizer = new Mode().getTokenizer();
 
         var state = "start";
@@ -247,7 +247,7 @@ function test(startAt) {
     for (var i = Math.max(0, startAt||0); i < modes.length; i++)
         testMode(modes[i], i);
 
-    console.log("\u001b[32m" + "all ok" + "\u001b[0m");
+    silent || console.log("\u001b[32m" + "all ok" + "\u001b[0m");
 }
 function testMode(modeName, i) {
     console.log(padNumber(i+1, 3) + ") testing: \u001b[33m" + modeName + "\u001b[0m");
@@ -344,9 +344,21 @@ function checkBacktracking(tokenizer) {
 }
 
 // cli
+var silent = false;
 var arg = process.argv[2];
 var RECHECK = process.argv.indexOf("--recheck") !== -1;
-if (!arg) {
+if (global.describe && global.it) {
+    silent = true;
+    global.describe("check modes", function() {
+        global.it("should check modes", function() {
+            checkModes();
+        });
+        global.it("should test modes", function() {
+            test();
+        });
+    });
+}
+else if (!arg) {
     test();
     checkModes();
 } else if (/--?g(en)?/.test(arg))

src/scrollbar_test.js

@@ -50,6 +50,7 @@ module.exports = {
         editor.setOptions({
             customScrollbar: true
         });
+        renderer.$loop._flush();
     },
     tearDown: function () {
         editor && editor.destroy();

src/test/mockdom.js

@@ -927,20 +927,25 @@ exports.load = function() {
     Object.keys(window).forEach(function(i) {
         var desc = Object.getOwnPropertyDescriptor(global, i);
         originalProperties[i] = desc;
-        global.__defineGetter__(i, function() {
-            return overriddenValues[i] || window[i];
-        });
-        global.__defineSetter__(i, function(value) {
-            if (!overridableProperties.includes(i)) {
-                console.log("attempt to set " + i);
-            } else if (value === window[i]) {
-                delete overriddenValues[i];
-                if (!loaded) {
-                    unloadProperty(i);
+        Object.defineProperty(global, i, {
+            get: function() {
+                return overriddenValues[i] || window[i];
+            }, 
+            set: function(value) {
+                if (!overridableProperties.includes(i)) {
+                    console.trace("attempt to set " + i);
+                } else if (value === window[i]) {
+                    delete overriddenValues[i];
+                    if (!loaded) {
+                        unloadProperty(i);
+                    }
+                } else {
+                    overriddenValues[i] = value;
                 }
-            } else {
-                overriddenValues[i] = value;
-            }
+            },
+            // writable: true, 
+            enumerable: true,
+            configurable: true,
         });
     });
     loaded = true;
@@ -954,6 +959,8 @@ exports.loadInBrowser = function(global, $setSize) {
     delete global.ResizeObserver;
     global.__origRoot__ = global.document.documentElement;
     global.__origBody__ = global.document.body;
+    global.document.createElementOrig = global.document.createElement;
+    global.document.createTextNodeOrig = global.document.createTextNode;
     Object.keys(window).forEach(function(i) {
         if (i != "document" && i != "window") {
             delete global[i];
@@ -964,7 +971,6 @@ exports.loadInBrowser = function(global, $setSize) {
         var val = window.document[i];
         if (typeof val == "function") {
             if (i == "createElement") {
-                global.document.createElementOrig = global.document.createElement;
                 val = function(n) {
                     if (n == "script")
                         return global.document.createElementOrig(n);

src/test/run.js

@@ -4,8 +4,9 @@ module.exports = function(testModule) {
     if (testModule === require.main) {
         require("asyncjs").test.testcase(testModule.exports).exec();
     }
-    else if (typeof global == "object" && global.describe && global.it) {
-        global.describe("#: " + testModule.id, function() {            
+    else if (typeof global == "object" && global.describe && (global.it || global.test)) {
+        if (!global.it) global.it = global.test;
+        global.describe("# file: " + testModule.id, function() {            
             for (let i in testModule.exports) {
                 if (/^test/.test(i)) {
                     let fn = testModule.exports[i];

src/test/update_test_list.js

@@ -16,8 +16,8 @@ if (testFiles.length === 0) {
     process.exit(1);
 }
 
- var testListFilePath = __dirname + "/test_list.js";
-var data =  `module.exports = [\n    "${testFiles.join('",\n    "')}"\n];`
+var testListFilePath = __dirname + "/test_list.js";
+var data = `module.exports = [\n    "${testFiles.join('",\n    "')}"\n];`;
 
 // Write the updated content back to the file
 fs.writeFileSync(testListFilePath, data, "utf8");