Merge remote-tracking branch 'origin/master' into jpa-entry-point-cleanup

test/unit/js/DockerRunnerTests.js

@@ -202,9 +202,9 @@ describe('DockerRunner', function() {
           }
           if (firstTime) {
             firstTime = false
-            return callback(
-              new Error('HTTP code is 500 which indicates error: server error')
-            )
+            const error = new Error('(HTTP code 500) server error - ...')
+            error.statusCode = 500
+            return callback(error)
           } else {
             return callback(null, this.output)
           }

test/unit/js/ResourceWriterTests.js

@@ -36,6 +36,7 @@ describe('ResourceWriter', function() {
         './OutputFileFinder': (this.OutputFileFinder = {}),
         'logger-sharelatex': { log: sinon.stub(), err: sinon.stub() },
         './Metrics': (this.Metrics = {
+          inc: sinon.stub(),
           Timer: (Timer = (function() {
             Timer = class Timer {
               static initClass() {