Try to fix issue with acceptance tests timing out

This commit is contained in:
James Allen 2016-12-08 11:25:25 +00:00
parent 7bade0a8bb
commit 5d377713d6
6 changed files with 27 additions and 21 deletions

View file

@ -30,6 +30,9 @@ describe "applyOtUpdate", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
(cb) =>
@ -81,6 +84,9 @@ describe "applyOtUpdate", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
(cb) =>

View file

@ -29,7 +29,7 @@ describe "joinDoc", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
@ -66,7 +66,7 @@ describe "joinDoc", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
@ -103,7 +103,7 @@ describe "joinDoc", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
@ -145,7 +145,7 @@ describe "joinDoc", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb

View file

@ -23,7 +23,7 @@ describe "joinProject", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, (error, @project, @privilegeLevel, @protocolVersion) =>
@ -75,7 +75,7 @@ describe "joinProject", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, (@error, @project, @privilegeLevel, @protocolVersion) =>

View file

@ -29,7 +29,7 @@ describe "leaveDoc", ->
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb

View file

@ -21,11 +21,11 @@ describe "leaveProject", ->
(cb) =>
@clientA = RealTimeClient.connect()
@clientA.on "connect", cb
@clientA.on "connectionAccepted", cb
(cb) =>
@clientB = RealTimeClient.connect()
@clientB.on "connect", cb
@clientB.on "connectionAccepted", cb
@clientBDisconnectMessages = []
@clientB.on "clientTracking.clientDisconnected", (data) =>
@ -46,7 +46,7 @@ describe "leaveProject", ->
(cb) =>
# The API waits a little while before flushing changes
setTimeout done, require("../../../app/js/WebsocketController").FLUSH_IF_EMPTY_DELAY * 2
setTimeout done, 1000
], done
@ -91,7 +91,7 @@ describe "leaveProject", ->
(cb) =>
# The API waits a little while before flushing changes
setTimeout done, require("../../../app/js/WebsocketController").FLUSH_IF_EMPTY_DELAY * 2
setTimeout done, 1000
], done
it "should flush the project to the document updater", ->

View file

@ -31,11 +31,11 @@ describe "receiveUpdate", ->
(cb) =>
@clientA = RealTimeClient.connect()
@clientA.on "connect", cb
@clientA.on "connectionAccepted", cb
(cb) =>
@clientB = RealTimeClient.connect()
@clientB.on "connect", cb
@clientB.on "connectionAccepted", cb
(cb) =>
@clientA.emit "joinProject", {