adjusting unit tests

This commit is contained in:
Daniel Felder
2014-06-01 18:16:05 +02:00
parent f03b2df461
commit 5ad0ca08f9
4 changed files with 9 additions and 9 deletions
@@ -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?
@@ -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)
@@ -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", ->
@@ -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 ->