linked chat into the editor real time contorller

This commit is contained in:
Henry Oswald 2014-07-04 13:20:30 +01:00
parent 86a9d08e5c
commit 0d02241b46
2 changed files with 16 additions and 2 deletions

View file

@ -1,11 +1,13 @@
ChatHandler = require("./ChatHandler")
EditorRealTimeController = require("../Editor/EditorRealTimeController")
module.exports =
sendMessage: (project_id, user_id, messageContent, callback)->
ChatHandler.sendMessage project_id, user_id, messageContent, (err)->
callback()
ChatHandler.sendMessage project_id, user_id, messageContent, (err, builtMessge)->
EditorRealTimeController.emitToRoom project_id, "new-chat-message", builtMessge, (err)->
callback(err)
getMessages: (project_id, query, callback)->
ChatHandler.getMessages project_id, query, (err)->

View file

@ -15,10 +15,13 @@ describe "ChatController", ->
sendMessage:sinon.stub()
getMessages:sinon.stub()
@EditorRealTimeController =
emitToRoom:sinon.stub().callsArgWith(3)
@ChatController = SandboxedModule.require modulePath, requires:
"settings-sharelatex":@settings
"logger-sharelatex": log:->
"./ChatHandler":@ChatHandler
"../Editor/EditorRealTimeController":@EditorRealTimeController
@query =
before:"some time"
@ -32,6 +35,15 @@ describe "ChatController", ->
@ChatHandler.sendMessage.calledWith(@project_id, @user_id, @messageContent).should.equal true
done()
it "should tell the editor real time controller about the update with the data from the chat handler", (done)->
@chatMessage =
content:"hello world"
@ChatHandler.sendMessage.callsArgWith(3, null, @chatMessage)
@ChatController.sendMessage @project_id, @user_id, @messageContent, (err)=>
@EditorRealTimeController.emitToRoom.calledWith(@project_id, "new-chat-message", @chatMessage).should.equal true
done()
describe "getMessages", ->
it "should tell the chat handler about the request", (done)->