From 8efd562eb3a5f5af9df9dfed6a7cbd21226e7d1c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 21 May 2018 13:40:03 +0100 Subject: [PATCH] fix broken acceptence tests, bad quotes in file path --- services/filestore/app/coffee/FileHandler.coffee | 2 ++ .../filestore/test/acceptance/coffee/SendingFileTest.coffee | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/filestore/app/coffee/FileHandler.coffee b/services/filestore/app/coffee/FileHandler.coffee index 93cad984dd..442ac13cab 100644 --- a/services/filestore/app/coffee/FileHandler.coffee +++ b/services/filestore/app/coffee/FileHandler.coffee @@ -76,6 +76,8 @@ module.exports = LocalFileWriter.deleteFile originalFsPath, -> callback(err, destPath, originalFsPath) + logger.log opts:opts, "converting file depending on opts" + if opts.format? FileConverter.convert originalFsPath, opts.format, done else if opts.style == "thumbnail" diff --git a/services/filestore/test/acceptance/coffee/SendingFileTest.coffee b/services/filestore/test/acceptance/coffee/SendingFileTest.coffee index 1b20e6b44f..cee06e82a3 100644 --- a/services/filestore/test/acceptance/coffee/SendingFileTest.coffee +++ b/services/filestore/test/acceptance/coffee/SendingFileTest.coffee @@ -136,18 +136,18 @@ describe "Filestore", -> describe "getting the preview image", -> beforeEach -> - @fileUrl = @fileUrl + '?style=preview' + @previewFileUrl = "#{@fileUrl}?style=preview" it "should not time out", (done) -> @timeout(1000 * 20) - request.get @fileUrl, (err, response, body) => + request.get @previewFileUrl, (err, response, body) => expect(response).to.not.equal null done() it "should respond with image data", (done) -> # note: this test relies of the imagemagick conversion working @timeout(1000 * 20) - request.get @fileUrl, (err, response, body) => + request.get @previewFileUrl, (err, response, body) => expect(response.statusCode).to.equal 200 expect(body.length).to.be.greaterThan 400 done()