Refactor acceptance tests to wait for connection before proceeding

services/real-time/test/acceptance/coffee/ClientTrackingTests.coffee

@@ -6,27 +6,35 @@ RealTimeClient = require "./helpers/RealTimeClient"
 MockWebServer = require "./helpers/MockWebServer"
 FixturesManager = require "./helpers/FixturesManager"
 
+async = require "async"
+
 describe "clientTracking", ->
 	before (done) ->
+		async.series [
+			(cb) =>
 				FixturesManager.setUpProject {
 					privilegeLevel: "owner"
-			project: {
+					project: { name: "Test Project"	}
-				name: "Test Project"
+				}, (error, {@user_id, @project_id}) => cb()
-			}
+			
-		}, (error, data) =>
+			(cb) =>
-			throw error if error?
-			{@user_id, @project_id} = data
 				@clientA = RealTimeClient.connect()
+				@clientA.on "connect", cb
+				
+			(cb) =>
 				@clientB = RealTimeClient.connect()
+				@clientB.on "connect", cb
+				
+			(cb) =>
 				@clientA.emit "joinProject", {
 					project_id: @project_id
-			}, (error) =>
+				}, cb
-				throw error if error?
+				
+			(cb) =>
 				@clientB.emit "joinProject", {
 					project_id: @project_id
-				}, (error) =>
+				}, cb
-					throw error if error?
+		], done
-					done()
 					
 	describe "when a client updates its cursor location", ->
 		before (done) ->

services/real-time/test/acceptance/coffee/JoinDocTests.coffee

@@ -6,6 +6,8 @@ RealTimeClient = require "./helpers/RealTimeClient"
 MockDocUpdaterServer = require "./helpers/MockDocUpdaterServer"
 FixturesManager = require "./helpers/FixturesManager"
 
+async = require "async"
+
 describe "joinDoc", ->
 	before ->
 		@lines = ["test", "doc", "lines"]
@@ -14,20 +16,27 @@ describe "joinDoc", ->
 			
 	describe "when authorised readAndWrite", ->
 		before (done) ->
+			async.series [
+				(cb) =>
 					FixturesManager.setUpProject {
 						privilegeLevel: "readAndWrite"
-			}, (error, data) =>
+					}, (e, {@project_id, @user_id}) =>
-				throw error if error?
+						cb(e)
-				{@project_id, @user_id} = data
+					
-				FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (error, data) =>
+				(cb) =>
-					throw error if error?
+					FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
-					{@doc_id} = data
+						cb(e)
+						
+				(cb) =>
 					@client = RealTimeClient.connect()
-					@client.emit "joinProject", project_id: @project_id, (error) =>
+					@client.on "connect", cb
-						throw error if error?
+						
-						@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) =>
+				(cb) =>
-							throw error if error?
+					@client.emit "joinProject", project_id: @project_id, cb
-							done()
+				
+				(cb) =>
+					@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) => cb(error)
+			], done
 
 		it "should get the doc from the doc updater", ->
 			MockDocUpdaterServer.getDocument
@@ -44,20 +53,27 @@ describe "joinDoc", ->
 		
 	describe "when authorised readOnly", ->
 		before (done) ->
+			async.series [
+				(cb) =>
 					FixturesManager.setUpProject {
 						privilegeLevel: "readOnly"
-			}, (error, data) =>
+					}, (e, {@project_id, @user_id}) =>
-				throw error if error?
+						cb(e)
-				{@project_id, @user_id} = data
+					
-				FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (error, data) =>
+				(cb) =>
-					throw error if error?
+					FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
-					{@doc_id} = data
+						cb(e)
+						
+				(cb) =>
 					@client = RealTimeClient.connect()
-					@client.emit "joinProject", project_id: @project_id, (error) =>
+					@client.on "connect", cb
-						throw error if error?
+						
-						@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) =>
+				(cb) =>
-							throw error if error?
+					@client.emit "joinProject", project_id: @project_id, cb
-							done()
+				
+				(cb) =>
+					@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) => cb(error)
+			], done
 
 		it "should get the doc from the doc updater", ->
 			MockDocUpdaterServer.getDocument
@@ -74,20 +90,27 @@ describe "joinDoc", ->
 		
 	describe "when authorised as owner", ->
 		before (done) ->
+			async.series [
+				(cb) =>
 					FixturesManager.setUpProject {
 						privilegeLevel: "owner"
-			}, (error, data) =>
+					}, (e, {@project_id, @user_id}) =>
-				throw error if error?
+						cb(e)
-				{@project_id, @user_id} = data
+					
-				FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (error, data) =>
+				(cb) =>
-					throw error if error?
+					FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
-					{@doc_id} = data
+						cb(e)
+						
+				(cb) =>
 					@client = RealTimeClient.connect()
-					@client.emit "joinProject", project_id: @project_id, (error) =>
+					@client.on "connect", cb
-						throw error if error?
+						
-						@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) =>
+				(cb) =>
-							throw error if error?
+					@client.emit "joinProject", project_id: @project_id, cb
-							done()
+				
+				(cb) =>
+					@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) => cb(error)
+			], done
 
 		it "should get the doc from the doc updater", ->
 			MockDocUpdaterServer.getDocument
@@ -109,20 +132,27 @@ describe "joinDoc", ->
 	describe "with a fromVersion", ->
 		before (done) ->
 			@fromVersion = 36
+			async.series [
+				(cb) =>
 					FixturesManager.setUpProject {
 						privilegeLevel: "readAndWrite"
-			}, (error, data) =>
+					}, (e, {@project_id, @user_id}) =>
-				throw error if error?
+						cb(e)
-				{@project_id, @user_id} = data
+					
-				FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (error, data) =>
+				(cb) =>
-					throw error if error?
+					FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
-					{@doc_id} = data
+						cb(e)
+						
+				(cb) =>
 					@client = RealTimeClient.connect()
-					@client.emit "joinProject", project_id: @project_id, (error) =>
+					@client.on "connect", cb
-						throw error if error?
+						
-						@client.emit "joinDoc", @doc_id, @fromVersion, (error, @returnedArgs...) =>
+				(cb) =>
-							throw error if error?
+					@client.emit "joinProject", project_id: @project_id, cb
-							done()
+				
+				(cb) =>
+					@client.emit "joinDoc", @doc_id, @fromVersion, (error, @returnedArgs...) => cb(error)
+			], done
 
 		it "should get the doc from the doc updater with the fromVersion", ->
 			MockDocUpdaterServer.getDocument

services/real-time/test/acceptance/coffee/JoinProjectTests.coffee

@@ -6,24 +6,29 @@ RealTimeClient = require "./helpers/RealTimeClient"
 MockWebServer = require "./helpers/MockWebServer"
 FixturesManager = require "./helpers/FixturesManager"
 
+async = require "async"
 
 describe "joinProject", ->
 	describe "when authorized", ->
 		before (done) ->
+			async.series [
+				(cb) =>
 					FixturesManager.setUpProject {
 						privilegeLevel: "owner"
 						project: {
 							name: "Test Project"
 						}
-			}, (error, data) =>
+					}, (e, {@project_id, @user_id}) =>
-				throw error if error?
+						cb(e)
-				{@user_id, @project_id} = data
+						
+				(cb) =>
 					@client = RealTimeClient.connect()
-				@client.emit "joinProject", {
+					@client.on "connect", cb
-					project_id: @project_id
+						
-				}, (error, @project, @privilegeLevel, @protocolVersion) =>
+				(cb) =>
-					throw error if error?
+					@client.emit "joinProject", project_id: @project_id, (error, @project, @privilegeLevel, @protocolVersion) =>
-					done()
+						cb(error)
+			], done
 					
 		it "should get the project from web", ->
 			MockWebServer.joinProject
@@ -58,19 +63,24 @@ describe "joinProject", ->
 			
 	describe "when not authorized", ->
 		before (done) ->
+			async.series [
+				(cb) =>
 					FixturesManager.setUpProject {
 						privilegeLevel: null
 						project: {
 							name: "Test Project"
 						}
-			}, (error, data) =>
+					}, (e, {@project_id, @user_id}) =>
-				throw error if error?
+						cb(e)
-				{@user_id, @project_id} = data
+						
+				(cb) =>
 					@client = RealTimeClient.connect()
-				@client.emit "joinProject", {
+					@client.on "connect", cb
-					project_id: @project_id
+						
-				}, (@error, @project, @privilegeLevel, @protocolVersion) =>
+				(cb) =>
-					done()
+					@client.emit "joinProject", project_id: @project_id, (@error, @project, @privilegeLevel, @protocolVersion) =>
+						cb()
+			], done
 		
 		it "should return an error", ->
 			# We don't return specific errors

services/real-time/test/acceptance/coffee/LeaveDocTests.coffee

@@ -6,6 +6,8 @@ RealTimeClient = require "./helpers/RealTimeClient"
 MockDocUpdaterServer = require "./helpers/MockDocUpdaterServer"
 FixturesManager = require "./helpers/FixturesManager"
 
+async = require "async"
+
 describe "leaveDoc", ->
 	before ->
 		@lines = ["test", "doc", "lines"]
@@ -14,20 +16,27 @@ describe "leaveDoc", ->
 			
 	describe "when joined to a doc", ->
 		before (done) ->
+			async.series [
+				(cb) =>
 					FixturesManager.setUpProject {
 						privilegeLevel: "readAndWrite"
-			}, (error, data) =>
+					}, (e, {@project_id, @user_id}) =>
-				throw error if error?
+						cb(e)
-				{@project_id, @user_id} = data
+					
-				FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (error, data) =>
+				(cb) =>
-					throw error if error?
+					FixturesManager.setUpDoc @project_id, {@lines, @version, @ops}, (e, {@doc_id}) =>
-					{@doc_id} = data
+						cb(e)
+						
+				(cb) =>
 					@client = RealTimeClient.connect()
-					@client.emit "joinProject", project_id: @project_id, (error) =>
+					@client.on "connect", cb
-						throw error if error?
+						
-						@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) =>
+				(cb) =>
-							throw error if error?
+					@client.emit "joinProject", project_id: @project_id, cb
-							done()
+				
+				(cb) =>
+					@client.emit "joinDoc", @doc_id, (error, @returnedArgs...) => cb(error)
+			], done
 							
 		describe "then leaving the doc", ->
 			before (done) ->