some fixes for tests

intersystems-community · Aug 12, 2019 · 1bfd2e3 · 1bfd2e3
1 parent 8ef3dfb
commit 1bfd2e3
Show file tree

Hide file tree

Showing 14 changed files with 624 additions and 2,116 deletions.
diff --git a/.snyk b/.snyk
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,30 +7,44 @@
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--disable-extensions", "--extensionDevelopmentPath=${workspaceRoot}"],
+      "args": [
+        "--disable-extensions",
+        "--extensionDevelopmentPath=${workspaceRoot}"
+      ],
       "stopOnEntry": false,
       "sourceMaps": true,
-      "outFiles": ["${workspaceRoot}/out/**/*.js"],
+      "outFiles": [
+        "${workspaceRoot}/out/**/*.js"
+      ],
       "preLaunchTask": "npm: watch"
     },
     {
       "name": "Launch Extension",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+      "args": [
+        "--extensionDevelopmentPath=${workspaceRoot}"
+      ],
       "stopOnEntry": false,
       "sourceMaps": true,
-      "outFiles": ["${workspaceRoot}/out/**/*.js"],
+      "outFiles": [
+        "${workspaceRoot}/out/**/*.js"
+      ],
       "preLaunchTask": "npm: watch"
     },
     {
       "name": "Extension Tests",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out/test"],
-      "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+      "args": [
+        "--extensionDevelopmentPath=${workspaceFolder}",
+        "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+      ],
+      "outFiles": [
+        "${workspaceFolder}/out/test/**/*.js"
+      ],
       "preLaunchTask": "npm: watch"
     }
   ]

diff --git a/build.yml b/build.yml
@@ -3,19 +3,19 @@ trigger:
     include:
       - master
   tags:
-    include: 
+    include:
       - v*
-    
+
 jobs:
   - job: Windows
     pool:
       name: Hosted VS2017
       demands: npm
     steps:
       - task: NodeTool@0
-        displayName: 'Use Node 8.x'
+        displayName: 'Use Node 10.x'
         inputs:
-          versionSpec: 8.x
+          versionSpec: 10.x
       - task: Npm@1
         displayName: 'Install dependencies'
         inputs:
@@ -26,17 +26,21 @@ jobs:
           command: custom
           verbose: false
           customCommand: 'run compile'
-      - script: 'node node_modules/vscode/bin/test'
+      - task: Npm@1
         displayName: 'Run tests'
+        inputs:
+          command: custom
+          verbose: false
+          customCommand: 'run test'
   - job: macOS
     pool:
       name: Hosted macOS
       demands: npm
     steps:
       - task: NodeTool@0
-        displayName: 'Use Node 8.x'
+        displayName: 'Use Node 10.x'
         inputs:
-          versionSpec: 8.x
+          versionSpec: 10.x
       - task: Npm@1
         displayName: 'Install dependencies'
         inputs:
@@ -47,17 +51,21 @@ jobs:
           command: custom
           verbose: false
           customCommand: 'run compile'
-      - script: 'node node_modules/vscode/bin/test'
+      - task: Npm@1
         displayName: 'Run tests'
+        inputs:
+          command: custom
+          verbose: false
+          customCommand: 'run test'
   - job: Linux
     pool:
       name: Hosted Ubuntu 1604
       demands: npm
     steps:
       - task: NodeTool@0
-        displayName: 'Use Node 8.x'
+        displayName: 'Use Node 10.x'
         inputs:
-          versionSpec: 8.x
+          versionSpec: 10.x
       - task: Npm@1
         displayName: 'Install dependencies'
         inputs:
@@ -73,10 +81,14 @@ jobs:
           /usr/bin/Xvfb :10 -ac >> /tmp/Xvfb.out 2>&1 &
           disown -ar
         displayName: 'Start xvfb'
-      - script: 'node node_modules/vscode/bin/test'
+      - task: Npm@1
         displayName: 'Run tests'
         env:
           DISPLAY: :10
+        inputs:
+          command: custom
+          verbose: false
+          customCommand: 'run test'
       - task: Npm@1
         displayName: 'Package VSIX'
         inputs: