Merge branch 'master' into kh/links-for-download

.gitignore

@@ -12,3 +12,6 @@ data/
 
 # Secrets
 secrets.sh
+
+# Test results from JUnit
+test-results.xml

Jenkinsfile

@@ -3,34 +3,42 @@
 @Library('realm-ci') _
 
 jobWrapper {
-  stage('Checkout') {
-    node('docker') {
+  node('docker') {
+    stage('Checkout') {
       rlmCheckout scm
     }
-  }
 
-  stage('Build & test') {
     if (env.CHANGE_TARGET) {
-      // This is a PR
-      node('docker') {
-        rlmCheckout scm
-
+      stage('Build') {
         // Computing a packageHash from the package-lock.json
         def packageHash = sh(
           script: "git ls-files -s package-lock.json | cut -d ' ' -f 2",
           returnStdout: true
         ).trim()
-
         // Using buildDockerEnv ensures that the image is pushed
         image = buildDockerEnv("ci/realm-studio:pr-${packageHash}", extra_args: '-f Dockerfile.testing')
+      }
+
+      stage('Test') {
         image.inside("-e HOME=${env.WORKSPACE} -v /etc/passwd:/etc/passwd:ro") {
           // Link in the node_modules from the image
           sh 'ln -s /tmp/node_modules .'
           // Test that the package-lock has changed while building the image
           // - if it has, a dependency was changed in package.json but not updated in the lock
           sh 'npm run check:package-lock'
-          // Run the tests with xvfb to allow opening windows virtually
-          sh './node_modules/.bin/xvfb-maybe npm test'
+          // Trying to test - but that might fail
+          try {
+            // Run the tests with xvfb to allow opening windows virtually, and report using the junit reporter
+            sh './node_modules/.bin/xvfb-maybe npm run test:ci'
+          } catch (err) {
+            error "Tests failed - see results on CI"
+          } finally {
+            junit(
+              allowEmptyResults: true,
+              keepLongStdio: true,
+              testResults: 'test-results.xml'
+            )
+          }
         }
       }
     }

Jenkinsfile.prepare

@@ -16,7 +16,7 @@ jobWrapper {
         ).trim()
         // Update the version in the package lock
         def lock = readJSON(file: 'package-lock.json')
-        lock.version = nextVersion
+        lock.version = nextVersion.substring(1) // Removing the v-prefix
         writeJSON(file: 'package-lock.json', json: lock, pretty: 2)
       }
       // Push the change to GitHub

package.json

@@ -83,6 +83,7 @@
     "prepare-next-release": "node ./scripts/prepare-next-release.js",
     "start": "rm -rf ./build && npm run build && npm run electron",
     "test": "mocha-webpack",
+    "test:ci": "mocha-webpack --reporter mocha-junit-reporter",
     "tslint-prettier": "tslint --fix 'src/**/*.ts' 'src/**/*.tsx'",
     "wait-for-bundle": "node ./webpack.wait-for-bundle.js",
     "webpack:main": "webpack --config=webpack.main.config.js",
@@ -146,6 +147,7 @@
     "jsdom": "^11.3.0",
     "lint-staged": "^4.3.0",
     "mocha": "^3.5.3",
+    "mocha-junit-reporter": "^1.15.0",
     "mocha-webpack": "^1.0.0-rc.1",
     "node-sass": "^4.5.3",
     "null-loader": "^0.1.1",