From 3a5b3a8e8d868be2489f7b45bb17198708782e34 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Tue, 6 Sep 2016 15:55:34 +0100
Subject: [PATCH] wip: acceptance tests working

---
 .../Authentication/AuthenticationController.coffee     |  5 -----
 .../web/test/acceptance/coffee/helpers/redis.coffee    | 10 ++--------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/services/web/app/coffee/Features/Authentication/AuthenticationController.coffee b/services/web/app/coffee/Features/Authentication/AuthenticationController.coffee
index 096f3335ca..161b0f2078 100644
--- a/services/web/app/coffee/Features/Authentication/AuthenticationController.coffee
+++ b/services/web/app/coffee/Features/Authentication/AuthenticationController.coffee
@@ -18,7 +18,6 @@ module.exports = AuthenticationController =
 	# 	AuthenticationController.doLogin req.body, req, res, next
 
 	serializeUser: (user, callback) ->
-		console.log ">> serialize", user._id
 		lightUser =
 			_id: user._id
 			first_name: user.first_name
@@ -31,14 +30,11 @@ module.exports = AuthenticationController =
 		callback(null, lightUser)
 
 	deserializeUser: (user, cb) ->
-		console.log ">> de-serialize", user._id
 		cb(null, user)
 
 	doPassportLogin: (req, username, password, done) ->
-		console.log(">>", username)
 		email = username.toLowerCase()
 		redir = Url.parse(req?.body?.redir or "/project").path
-		console.log ">> doing passport login", username, password, redir
 		LoginRateLimiter.processLoginRequest email, (err, isAllowed)->
 			return done(err) if err?
 			if !isAllowed
@@ -58,7 +54,6 @@ module.exports = AuthenticationController =
 					# capture the request ip for use when creating the session
 					user._login_req_ip = req.ip
 					req._redir = redir
-					console.log ">> done, returning user"
 					return done(null, user)
 				else
 					AuthenticationController._recordFailedLogin()
diff --git a/services/web/test/acceptance/coffee/helpers/redis.coffee b/services/web/test/acceptance/coffee/helpers/redis.coffee
index c4cb0ad032..2611e4fc57 100644
--- a/services/web/test/acceptance/coffee/helpers/redis.coffee
+++ b/services/web/test/acceptance/coffee/helpers/redis.coffee
@@ -8,14 +8,8 @@ rclient = redis.createClient(Settings.redis.web)
 module.exports =
 
 	getUserSessions: (user, callback=(err, sessionsSet)->) ->
-		console.log ">> user, get sessions", user._id
-		setTimeout(
-			()->
-				rclient.smembers "UserSessions:#{user._id}", (err, result) ->
-					console.log ">>", result
-					return callback(err, result)
-			, 1000
-		)
+		rclient.smembers "UserSessions:#{user._id}", (err, result) ->
+			return callback(err, result)
 
 	clearUserSessions: (user, callback=(err)->) ->
 		sessionSetKey = "UserSessions:#{user._id}"