From 5d017beac5f82d25b58e1d38ac9f53b3542e859c Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Mon, 26 Feb 2018 11:46:06 +0000
Subject: [PATCH] Fix stub incorrectly overriding top level beforeEach

---
 .../unit/coffee/FileStore/FileStoreHandlerTests.coffee | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/services/web/test/unit/coffee/FileStore/FileStoreHandlerTests.coffee b/services/web/test/unit/coffee/FileStore/FileStoreHandlerTests.coffee
index 90a3e870d1..5d21a98671 100644
--- a/services/web/test/unit/coffee/FileStore/FileStoreHandlerTests.coffee
+++ b/services/web/test/unit/coffee/FileStore/FileStoreHandlerTests.coffee
@@ -11,7 +11,7 @@ describe "FileStoreHandler", ->
 		@fs =
 			createReadStream : sinon.stub()
 			lstat: sinon.stub().callsArgWith(1, null, {
-				isFile:=> @isSafeOnFileSystem
+				isFile:=> true
 				isDirectory:-> return false
 			})
 		@writeStream =
@@ -35,7 +35,6 @@ describe "FileStoreHandler", ->
 	describe "uploadFileFromDisk", ->
 		beforeEach ->
 			@request.returns(@writeStream)
-			@isSafeOnFileSystem = true
 
 		it "should create read stream", (done)->
 			@fs.createReadStream.returns
@@ -91,8 +90,13 @@ describe "FileStoreHandler", ->
 				done()
 
 		describe "symlink", ->
+			beforeEach ->
+				@fs.lstat = sinon.stub().callsArgWith(1, null, {
+					isFile:=> false
+					isDirectory:-> return false
+				})
+
 			it "should not read file if it is symlink", (done)->
-				@isSafeOnFileSystem = false
 				@handler.uploadFileFromDisk @project_id, @file_id, @fsPath, =>
 					@fs.createReadStream.called.should.equal false
 					done()