From 133c4759f82ffce0cb26d164b481a9bb44f1d761 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 15 May 2014 18:26:00 +0100 Subject: [PATCH] fix tests, whoops --- services/web/app/coffee/Features/Email/EmailBuilder.coffee | 1 - .../coffee/Features/PasswordReset/PasswordResetHandler.coffee | 2 +- .../coffee/PasswordReset/PasswordResetHandlerTests.coffee | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/Email/EmailBuilder.coffee b/services/web/app/coffee/Features/Email/EmailBuilder.coffee index 710ab089ea..8da26bc8b3 100644 --- a/services/web/app/coffee/Features/Email/EmailBuilder.coffee +++ b/services/web/app/coffee/Features/Email/EmailBuilder.coffee @@ -93,7 +93,6 @@ module.exports = buildEmail: (templateName, opts)-> template = templates[templateName] - console.log opts opts.body = template.compiledTemplate(opts) return { subject : template.subject(opts) diff --git a/services/web/app/coffee/Features/PasswordReset/PasswordResetHandler.coffee b/services/web/app/coffee/Features/PasswordReset/PasswordResetHandler.coffee index d3ab863094..6c062989f1 100644 --- a/services/web/app/coffee/Features/PasswordReset/PasswordResetHandler.coffee +++ b/services/web/app/coffee/Features/PasswordReset/PasswordResetHandler.coffee @@ -25,6 +25,6 @@ module.exports = TokenGenerator.getUserIdFromToken token, (err, user_id)-> if err then return callback(err) if !user_id? - logger.err email:email, "token for password reset did not find user_id" + logger.err user_id:user_id, "token for password reset did not find user_id" return callback("no user found") AuthenticationManager.setUserPassword user_id, password, callback \ No newline at end of file diff --git a/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetHandlerTests.coffee b/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetHandlerTests.coffee index 5630898a38..5797dc86e1 100644 --- a/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetHandlerTests.coffee +++ b/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetHandlerTests.coffee @@ -27,7 +27,9 @@ describe "PasswordResetHandler", -> "../Email/EmailHandler":@EmailHandler "../Authentication/AuthenticationManager":@AuthenticationManager "settings-sharelatex": @settings - "logger-sharelatex": log:-> + "logger-sharelatex": + log:-> + err:-> @token = "12312321i" @user_id = "user_id_here" @user =