Browse Source

adjusting unit tests

Daniel Felder 12 years ago
parent
commit
5ad0ca08f9

+ 1 - 1
services/web/app/coffee/Features/Compile/CompileController.coffee

@@ -11,7 +11,7 @@ module.exports = CompileController =
 	compile: (req, res, next = (error) ->) ->
 		project_id = req.params.Project_id
 		isAutoCompile = !!req.query?.auto_compile
-		settingsOverride = req.body.settingsOverride ? {};
+		settingsOverride = req.body?.settingsOverride ? {};
 		logger.log "root doc overriden" if settingsOverride.rootDoc_id?
 		AuthenticationController.getLoggedInUserId req, (error, user_id) ->
 			return next(error) if error?

+ 1 - 1
services/web/app/coffee/Features/Compile/CompileManager.coffee

@@ -30,7 +30,7 @@ module.exports = CompileManager =
 					return callback(error) if error?
 					DocumentUpdaterHandler.flushProjectToMongo project_id, (error) ->
 						return callback(error) if error?
-						ClsiManager.sendRequest project_id, opt.settingsOverride, (error, status, outputFiles) ->
+						ClsiManager.sendRequest project_id, opt.settingsOverride ? null, (error, status, outputFiles) ->
 							return callback(error) if error?
 							logger.log files: outputFiles, "output files"
 							callback(null, status, outputFiles)

+ 6 - 6
services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee

@@ -24,7 +24,7 @@ describe "ClsiManager", ->
 
 	describe "sendRequest", ->
 		beforeEach ->
-			@ClsiManager._buildRequest = sinon.stub().callsArgWith(1, null, @request = "mock-request")
+			@ClsiManager._buildRequest = sinon.stub().callsArgWith(2, null, @request = "mock-request")
 
 		describe "with a successful compile", ->
 			beforeEach ->
@@ -39,7 +39,7 @@ describe "ClsiManager", ->
 							type: "log"
 						}]
 				})
-				@ClsiManager.sendRequest @project_id, @callback
+				@ClsiManager.sendRequest @project_id, {}, @callback
 
 			it "should build the request", ->
 				@ClsiManager._buildRequest
@@ -67,7 +67,7 @@ describe "ClsiManager", ->
 					compile:
 						status: @status = "failure"
 				})
-				@ClsiManager.sendRequest @project_id, @callback
+				@ClsiManager.sendRequest @project_id, {}, @callback
 			
 			it "should call the callback with a failure statue", ->
 				@callback.calledWith(null, @status).should.equal true
@@ -121,7 +121,7 @@ describe "ClsiManager", ->
 
 		describe "with a valid project", ->
 			beforeEach (done) ->
-				@ClsiManager._buildRequest @project_id, (error, request) =>
+				@ClsiManager._buildRequest @project_id, null, (error, request) =>
 					@request = request
 					done()
 
@@ -162,7 +162,7 @@ describe "ClsiManager", ->
 		describe "when the project has an invalid compiler", ->
 			beforeEach (done) ->
 				@project.compiler = "context"
-				@ClsiManager._buildRequest @project, (error, request) =>
+				@ClsiManager._buildRequest @project, null, (error, request) =>
 					@request = request
 					done()
 
@@ -172,7 +172,7 @@ describe "ClsiManager", ->
 		describe "when there is no valid root document", ->
 			beforeEach (done) ->
 				@project.rootDoc_id = "not-valid"
-				@ClsiManager._buildRequest @project, (@error, @request) =>
+				@ClsiManager._buildRequest @project, null, (@error, @request) =>
 					done()
 			
 			it "should return an error", ->

+ 1 - 1
services/web/test/UnitTests/coffee/Compile/CompileManagerTests.coffee

@@ -36,7 +36,7 @@ describe "CompileManager", ->
 			@CompileManager._checkIfRecentlyCompiled = sinon.stub().callsArgWith(2, null, false)
 			@CompileManager._ensureRootDocumentIsSet = sinon.stub().callsArgWith(1, null)
 			@DocumentUpdaterHandler.flushProjectToMongo = sinon.stub().callsArgWith(1, null)
-			@ClsiManager.sendRequest = sinon.stub().callsArgWith(1, null, @status = "mock-status")
+			@ClsiManager.sendRequest = sinon.stub().callsArgWith(2, null, @status = "mock-status")
 
 		describe "succesfully", ->
 			beforeEach ->