Mocha

.eslintrc

@@ -157,7 +157,7 @@
     // allow async/await in tests only
     overrides: [
         {
-            files: ["**/*_test.js"],
+            files: ["**/*_test.js", "src/test/run.js"],
             parserOptions: {
                 ecmaVersion: 2022, 
             },

.github/workflows/nodejs.yml

@@ -25,16 +25,14 @@ jobs:
     - uses: actions/checkout@v2
     - name: Fetch the master branch
       run: git fetch origin HEAD:refs/remotes/origin/HEAD --depth 1
-    - name: Fetch the master branch
-      run: git diff --name-only origin/HEAD --no-renames --diff-filter=ACMR
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm i
-    - run: npm run cover
-    # run linter
-    - run: |
+    - run: npm run cover-json
+    - run: | 
+        # eslint
         set -x;
         git status;
         git checkout HEAD -- package.json;
@@ -51,22 +49,22 @@ jobs:
                 node node_modules/eslint/bin/eslint $jsChanges;
             fi
         fi
-    # check types
-    - run: |
+    - run: | 
+        # check types
         set -x;
         npx tsc -v;
         npm run update-types;
         git diff --color --exit-code ./ace*d.ts;
         npm run typecheck;
         node_modules/.bin/tsc --noImplicitAny --strict --noUnusedLocals --noImplicitReturns --noUnusedParameters --noImplicitThis ace.d.ts;
-    - run: |
+    - run: | 
+        # test-npm-package
         set -x;
         ./tool/test-npm-package.sh
     # upload to codecov
     - uses: codecov/codecov-action@v3
       with:
         token: d8edca4b-8e97-41e5-b54e-34c7cf3b2d47
-        file: ./coverage/coverage.json
         flags: unittests
         name: codecov-umbrella
         fail_ci_if_error: true

package.json

@@ -17,9 +17,10 @@
         "amd-loader": "~0.0.4",
         "architect-build": "https://github.com/c9/architect-build/tarball/43a6fdeffe",
         "asyncjs": "~0.0.12",
+        "c8": "^11.0.0",
         "dryice": "0.4.11",
         "eslint": "^8.20.0",
-        "istanbul": "^0.4.5",
+        "mocha": "^11.7.5",
         "standard-version": "^9.3.2",
         "typescript": "5.9.2"
     },
@@ -40,8 +41,9 @@
     ],
     "scripts": {
         "start": "node static.js",
-        "test": "node src/test/all.js",
-        "cover": "istanbul cover src/test/all.js",
+        "test": "mocha \"./src/**/*_test.js\"  --exit -p --color",
+        "cover": "c8 --reporter=lcov  --reporter=text-summary npm run test",
+        "cover-json": "c8 --reporter=json npm run test",
         "lint": "eslint \"src/**/*.js\" \"*.js\"",
         "fix": "npm run lint -- --fix",
         "typecheck": "tsc -p tsconfig.json",

src/ace_test.js

@@ -185,6 +185,4 @@ function sendText(textarea, text) {
 }
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/anchor_test.js

@@ -182,6 +182,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/autocomplete/inline_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("../test/mockdom");
 }
 
@@ -368,6 +367,4 @@ module.exports = {
     }
 };
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("../test/run")(module);

src/autocomplete/popup_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("../test/mockdom");
 }
 
@@ -207,6 +206,4 @@ module.exports = {
     tearDown: tearDown
 };
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("../test/run")(module);

src/autocomplete_test.js

@@ -1632,6 +1632,4 @@ module.exports = {
     },
 };
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/background_tokenizer_test.js

@@ -25,7 +25,7 @@ module.exports = {
             "*/",
             "var juhu"
         ]);
-        doc.setMode("./mode/javascript");  
+        doc.setMode(new JavaScriptMode);  
 
         forceTokenize(doc);
         testStates(doc, ["comment1", "start", "no_regex"]);
@@ -49,7 +49,7 @@ module.exports = {
             "juhu",
             "*/"
         ]);
-        doc.setMode("./mode/javascript");
+        doc.setMode(new JavaScriptMode);
 
         var updateEvent = null;
         doc.bgTokenizer.on("update", function(e) {
@@ -92,7 +92,7 @@ module.exports = {
             "kinners]]--",
             ""
         ]);
-        doc.setMode("./mode/lua");
+        doc.setMode(new LuaMode);
         forceTokenize(doc);
         var string = "bracketedString,2,start";
         var comment = "bracketedComment,2,start";
@@ -111,6 +111,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/commands/command_manager_test.js

@@ -170,6 +170,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("../test/run")(module);

src/config_test.js

@@ -138,6 +138,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/document_test.js

@@ -351,6 +351,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/edit_session_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -1357,6 +1356,4 @@ module.exports = {
     }
 };
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/editor_change_document_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -149,6 +148,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/editor_commands_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -589,6 +588,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/editor_highlight_selected_word_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -184,6 +183,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/editor_navigation_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -225,6 +224,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/editor_options_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -91,6 +90,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/editor_text_edit_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("./test/mockdom");
 }
 
@@ -526,6 +525,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("./test/run")(module);

src/ext/beautify_test.js

@@ -416,6 +416,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("../test/run")(module);

src/ext/code_lens_test.js

@@ -1,5 +1,4 @@
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("../test/mockdom");
 }
 
@@ -210,6 +209,4 @@ module.exports = {
 };
 
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("../test/run")(module);

src/ext/command_bar_test.js

@@ -1,6 +1,4 @@
-/* global Promise */
 if (typeof process !== "undefined") {
-    require("amd-loader");
     require("../test/mockdom");
 }
 
@@ -587,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) +
@@ -664,6 +663,4 @@ module.exports = {
     }
 };
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("../test/run")(module);

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/diff_test.js

@@ -503,6 +503,4 @@ function assertDecoratorsPlacement(editor, inlineDiff) {
     assert.equal(findPointFillStyle(imgB, yB), decoA.colors.light.insert);
 }
 
-if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
-}
+require("../../test/run")(module);