alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to fix issue with acceptance tests timing out

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
services/real-time/test/acceptance/coffee/ApplyUpdateTests.coffee
+8 -2
View File
@@ -27,9 +27,12 @@ describe "applyOtUpdate", ->
(cb) =>
FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
(cb) =>
@@ -78,9 +81,12 @@ describe "applyOtUpdate", ->
(cb) =>
FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
(cb) =>
services/real-time/test/acceptance/coffee/JoinDocTests.coffee
+8 -8
View File
@@ -26,10 +26,10 @@ describe "joinDoc", ->
(cb) =>
FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
@@ -63,10 +63,10 @@ describe "joinDoc", ->
(cb) =>
FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
@@ -100,10 +100,10 @@ describe "joinDoc", ->
(cb) =>
FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
@@ -142,10 +142,10 @@ describe "joinDoc", ->
(cb) =>
FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, cb
services/real-time/test/acceptance/coffee/JoinProjectTests.coffee
+4 -4
View File
@@ -20,10 +20,10 @@ describe "joinProject", ->
}
}, (e, {@project_id, @user_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, (error, @project, @privilegeLevel, @protocolVersion) =>
@@ -72,10 +72,10 @@ describe "joinProject", ->
}
}, (e, {@project_id, @user_id}) =>
cb(e)
(cb) =>
@client = RealTimeClient.connect()
@client.on "connect", cb
@client.on "connectionAccepted", cb
(cb) =>
@client.emit "joinProject", project_id: @project_id, (@error, @project, @privilegeLevel, @protocolVersion) =>
services/real-time/test/acceptance/coffee/LeaveDocTests.coffee
+1 -1
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
services/real-time/test/acceptance/coffee/LeaveProjectTests.coffee
+4 -4
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", ->
services/real-time/test/acceptance/coffee/ReceiveUpdateTests.coffee
+2 -2
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", {