From eaa72d0747aac51230b334598e09cdaf0a7c79ab Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 27 Jun 2017 14:53:20 +0100 Subject: [PATCH] upgrade to node 6 --- services/filestore/.nvmrc | 2 +- .../unit/coffee/FSPersistorManagerTests.coffee | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/filestore/.nvmrc b/services/filestore/.nvmrc index 7fd0b1e8e6..e1e5d1369a 100644 --- a/services/filestore/.nvmrc +++ b/services/filestore/.nvmrc @@ -1 +1 @@ -0.12.4 \ No newline at end of file +6.9.5 diff --git a/services/filestore/test/unit/coffee/FSPersistorManagerTests.coffee b/services/filestore/test/unit/coffee/FSPersistorManagerTests.coffee index 63fe9eded7..46def22a05 100644 --- a/services/filestore/test/unit/coffee/FSPersistorManagerTests.coffee +++ b/services/filestore/test/unit/coffee/FSPersistorManagerTests.coffee @@ -81,7 +81,7 @@ describe "FSPersistorManagerTests", -> it "should use correct file location", (done) -> @Fs.createReadStream.returns({on: ->}) @FSPersistorManager.getFileStream @location, @name1, @opts, (err,res) => - @Fs.createReadStream.calledWith("#{@location}/#{@name1Filtered}").should.equal.true + @Fs.createReadStream.calledWith("#{@location}/#{@name1Filtered}").should.equal true done() describe "with start and end options", -> @@ -144,17 +144,17 @@ describe "FSPersistorManagerTests", -> it "Should open the source for reading", (done) -> @FSPersistorManager.copyFile @location, @name1, @name2, -> - @Fs.createReadStream.calledWith("#{@location}/#{@name1}").should.equal.true + @Fs.createReadStream.calledWith("#{@location}/#{@name1Filtered}").should.equal true done() it "Should open the target for writing", (done) -> @FSPersistorManager.copyFile @location, @name1, @name2, -> - @Fs.createWriteStream.calledWith("#{@location}/#{@name2}").should.equal.true + @Fs.createWriteStream.calledWith("#{@location}/#{@name2}").should.equal true done() it "Should pipe the source to the target", (done) -> @FSPersistorManager.copyFile @location, @name1, @name2, -> - @ReadStream.pipe.calledWith(@WriteStream).should.equal.true + @ReadStream.pipe.calledWith(@WriteStream).should.equal true done() describe "deleteFile", -> @@ -163,7 +163,7 @@ describe "FSPersistorManagerTests", -> it "Should call unlink with correct options", (done) -> @FSPersistorManager.deleteFile @location, @name1, (err) => - @Fs.unlink.calledWith("#{@location}/#{@name1}").should.equal.true + @Fs.unlink.calledWith("#{@location}/#{@name1Filtered}").should.equal true done() it "Should propogate the error", (done) -> @@ -178,7 +178,7 @@ describe "FSPersistorManagerTests", -> it "Should call rmdir(rimraf) with correct options", (done) -> @FSPersistorManager.deleteDirectory @location, @name1, (err) => - @Rimraf.calledWith("#{@location}/#{@name1}").should.equal.true + @Rimraf.calledWith("#{@location}/#{@name1Filtered}").should.equal true done() it "Should propogate the error", (done) -> @@ -192,7 +192,7 @@ describe "FSPersistorManagerTests", -> it "Should call exists with correct options", (done) -> @FSPersistorManager.checkIfFileExists @location, @name1, (exists) => - @Fs.exists.calledWith("#{@location}/#{@name1}").should.equal.true + @Fs.exists.calledWith("#{@location}/#{@name1Filtered}").should.equal true done() # fs.exists simply returns false on any error, so... @@ -226,4 +226,4 @@ describe "FSPersistorManagerTests", -> @Fs.fstatSync.returns({size : 1024}) @FSPersistorManager.directorySize @location, @name1, (err, totalsize) => expect(totalsize).to.equal 2048 - done() \ No newline at end of file + done()