Fix travis

.travis/install.sh

@@ -31,17 +31,17 @@ npm install --ignore-scripts
 npm run compile
 
 if [ "${TASK}" == "unit" ]; then
-    npm rebuild grpc --target=4.1.5 --runtime=electron --dist-url=https://atom.io/download/electron
+    npm rebuild grpc --target=3.0.0 --runtime=electron --dist-url=https://atom.io/download/electron
 
     if [ $TRAVIS_OS_NAME == "linux" ]; then
         export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
-        rm -rf ./node_modules/grpc/src/node/extension_binary/node-v69-linux-x64-glibc
-        mv ./node_modules/grpc/src/node/extension_binary/electron-v4.1-linux-x64-glibc ./node_modules/grpc/src/node/extension_binary/node-v69-linux-x64-glibc
+        rm -rf ./node_modules/grpc/src/node/extension_binary/node-v64-linux-x64-glibc
+        mv ./node_modules/grpc/src/node/extension_binary/electron-v3.0-linux-x64-glibc ./node_modules/grpc/src/node/extension_binary/node-v64-linux-x64-glibc
     elif [ $TRAVIS_OS_NAME == "windows" ]; then
-        rm -rf ./node_modules/grpc/src/node/extension_binary/node-v69-win32-x64-unknown
-        mv ./node_modules/grpc/src/node/extension_binary/electron-v4.1-win32-x64-unknown ./node_modules/grpc/src/node/extension_binary/node-v69-win32-x64-unknown
+        rm -rf ./node_modules/grpc/src/node/extension_binary/node-v64-win32-x64-unknown
+        mv ./node_modules/grpc/src/node/extension_binary/electron-v3.0-win32-x64-unknown ./node_modules/grpc/src/node/extension_binary/node-v64-win32-x64-unknown
     else
-        rm -rf ./node_modules/grpc/src/node/extension_binary/node-v69-darwin-x64-unknown
-        mv ./node_modules/grpc/src/node/extension_binary/electron-v4.1-darwin-x64-unknown ./node_modules/grpc/src/node/extension_binary/node-v69-darwin-x64-unknown
+        rm -rf ./node_modules/grpc/src/node/extension_binary/node-v64-darwin-x64-unknown
+        mv ./node_modules/grpc/src/node/extension_binary/electron-v3.0-darwin-x64-unknown ./node_modules/grpc/src/node/extension_binary/node-v64-darwin-x64-unknown
     fi
 fi

.travis/rewritePackageJson.js

@@ -28,6 +28,10 @@ if (process.argv.includes('publish')) {
     throw new Error('Activation events should be * when checked in');
   }
 
+  if (packageJson.engines.vscode !== '^1.36.0') {
+    throw new Error('Engine vscode should be ^1.36 when checked in');
+  }
+
   packageJson.activationEvents = [];
 
   packageJson.actualActivationEvents.onView.forEach((event) => {
@@ -41,6 +45,10 @@ if (process.argv.includes('publish')) {
   packageJson.actualActivationEvents.other.forEach((event) => {
     packageJson.activationEvents.push(event);
   });
+
+  packageJson.engines = {
+    vscode: '1.35.1'
+  };
 }
 
 

.travis/script.sh

@@ -89,6 +89,7 @@ else
     if [ $TRAVIS_OS_NAME == "windows" ]; then
         export CODE_DOWNLOAD_URL="https://vscode-update.azurewebsites.net/1.32.0/win32-x64-archive/stable"
     fi
-    npm test
+
     npm run package
+    npm test
 fi

client/.vscode/launch.json

@@ -31,25 +31,7 @@
         "${workspaceFolder}/out/test/**/*.js"
       ],
       "preLaunchTask": "npm: watch"
-    },
-    {
-      "name": "Debug Unit Tests (no coverage)",
-      "type": "extensionHost",
-      "request": "launch",
-      "runtimeExecutable": "${execPath}",
-      "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}",
-        "--extensionTestsPath=${workspaceFolder}/out/test"
-      ],
-      "outFiles": [
-        "${workspaceFolder}/out/test/**/*.js"
-      ],
-      "preLaunchTask": "npm: watch",
-      "env": {
-        "WITHOUTCOVERAGE": "true"
-      }
-    },
-    {
+    }, {
       "name": "Node Integration Tests",
       "type": "extensionHost",
       "request": "launch",
@@ -131,4 +113,4 @@
       }
     }
   ]
-}
+}

client/package.json

@@ -1145,6 +1145,7 @@
         "watch": "rimraf out && tsc -watch -p ./",
         "pretest": "npm run compile && npm run lint && npm run licchk && npm run updatePackageJSON",
         "test": "node ./out/test/runTests.js",
+        "posttest": "remap-istanbul -i ./coverage/coverage.json -o ./coverage/coverage-remap.json && istanbul check-coverage ./coverage/coverage-remap.json",
         "systest": "npm run compile && node ./out/integrationTest/nodeTests/runIntegrationTests.js",
         "cucumber": "npm run compile && node ./out/cucumber/runCucumberTests.js",
         "licchk": "license-check-and-add",