Clean up tests

.github/workflows/main.yml

@@ -71,8 +71,6 @@ jobs:
         uses: coactions/setup-xvfb@v1
         with:
           run: yarn test
-        env:
-          OPAMSWITCH: ${{ github.workspace }}
 
       - name: Publish extension to VSCode Marketplace
         if: success() && runner.os == 'Linux' && startsWith(github.ref, 'refs/tags')

.prettierignore

@@ -5,8 +5,8 @@ _build/
 _opam/
 
 # esy
-test/fixtures/sample-esy/_esy/
-test/fixtures/sample-esy/esy.lock/
+tests/fixtures/sample-esy/_esy/
+tests/fixtures/sample-esy/esy.lock/
 
 # Normal npm stuff
 node_modules/

dune

@@ -1 +1 @@
-(dirs :standard \ node_modules astexplorer)
+(dirs :standard \ astexplorer node_modules tests)

package.json

@@ -23,10 +23,10 @@
     "astexplorer"
   ],
   "scripts": {
-    "test:esy": "node ./test/runEsyTests.js",
-    "test:opam": "node ./test/runOpamTests.js",
-    "test:problems": "node ./test/runProblemMatcherTests.js",
-    "test": "npm-run-all -s test:opam test:problems",
+    "test:basic": "node ./tests/runBasicTests.js",
+    "test:esy": "node ./tests/runEsyTests.js",
+    "test:opam": "node ./tests/runOpamTests.js",
+    "test": "npm-run-all -s test:basic test:opam",
     "package": "vsce package --out ocaml-platform.vsix --yarn --no-dependencies",
     "deploy:vsce": "vsce publish --packagePath ocaml-platform.vsix --yarn --no-dependencies",
     "deploy:ovsx": "ovsx publish --yarn --no-dependencies",
@@ -1214,6 +1214,7 @@
     "@vscode/vsce": "2.21.1",
     "esbuild": "0.19.5",
     "fs-extra": "11.1.1",
+    "glob": "10.3.10",
     "mocha": "10.2.0",
     "npm-run-all": "4.1.5",
     "ovsx": "0.8.3",

test/fixtures/sample-opam/sample-opam.opam → tests/fixtures/sample-opam/sample-opam.opam

@@ -6,7 +6,4 @@ homepage: "foo"
 description: "Description"
 synopsis: "Synopsis"
 bug-reports: "https//foo.bar"
-depends: [
-  "ocaml"             {>= "4.04.2" & < "5.00.0"}
-  "base"              {>= "v0.12" }
-]
+depends: ["ocaml" "base"]

test/runProblemMatcherTests.js → tests/runBasicTests.js

@@ -1,24 +1,20 @@
-const path = require("path");
+const path = require("node:path");
 
 const { runTests } = require("@vscode/test-electron");
 
 async function main() {
   try {
-    // The folder containing the Extension Manifest package.json
-    // Passed to `--extensionDevelopmentPath`
     const extensionDevelopmentPath = path.resolve(__dirname, "../");
 
-    // The path to the extension test script
-    // Passed to --extensionTestsPath
-    const extensionTestsPath = path.resolve(__dirname, "./suite/problems");
+    const extensionTestsPath = path.resolve(__dirname, "./suite/basic");
 
-    // Download VS Code, unzip it and run the integration test
     await runTests({
       extensionDevelopmentPath,
       extensionTestsPath,
       launchArgs: ["--disable-extensions"],
     });
   } catch (err) {
+    console.error(err);
     console.error("Failed to run tests");
     process.exit(1);
   }

tests/runEsyTests.js

@@ -0,0 +1,23 @@
+const path = require("node:path");
+
+const { runTests } = require("@vscode/test-electron");
+
+async function main() {
+  try {
+    const extensionDevelopmentPath = path.resolve(__dirname, "../");
+
+    const extensionTestsPath = path.resolve(__dirname, "./suite/esy");
+
+    await runTests({
+      extensionDevelopmentPath,
+      extensionTestsPath,
+      launchArgs: ["--disable-extensions"],
+    });
+  } catch (err) {
+    console.error(err);
+    console.error("Failed to run tests");
+    process.exit(1);
+  }
+}
+
+main();