Bladeren bron

fix tests, whoops

Henry Oswald 12 jaren geleden
bovenliggende
commit
133c4759f8

+ 0 - 1
services/web/app/coffee/Features/Email/EmailBuilder.coffee

@@ -93,7 +93,6 @@ module.exports =
 
 
 	buildEmail: (templateName, opts)->
 	buildEmail: (templateName, opts)->
 		template = templates[templateName]
 		template = templates[templateName]
-		console.log opts
 		opts.body = template.compiledTemplate(opts)
 		opts.body = template.compiledTemplate(opts)
 		return {
 		return {
 			subject : template.subject(opts)
 			subject : template.subject(opts)

+ 1 - 1
services/web/app/coffee/Features/PasswordReset/PasswordResetHandler.coffee

@@ -25,6 +25,6 @@ module.exports =
 		TokenGenerator.getUserIdFromToken token, (err, user_id)->
 		TokenGenerator.getUserIdFromToken token, (err, user_id)->
 			if err then return callback(err)
 			if err then return callback(err)
 			if !user_id?
 			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")
 				return callback("no user found")
 			AuthenticationManager.setUserPassword user_id, password, callback
 			AuthenticationManager.setUserPassword user_id, password, callback

+ 3 - 1
services/web/test/UnitTests/coffee/PasswordReset/PasswordResetHandlerTests.coffee

@@ -27,7 +27,9 @@ describe "PasswordResetHandler", ->
 			"../Email/EmailHandler":@EmailHandler
 			"../Email/EmailHandler":@EmailHandler
 			"../Authentication/AuthenticationManager":@AuthenticationManager
 			"../Authentication/AuthenticationManager":@AuthenticationManager
 			"settings-sharelatex": @settings
 			"settings-sharelatex": @settings
-			"logger-sharelatex": log:->
+			"logger-sharelatex": 
+				log:->
+				err:->
 		@token = "12312321i"
 		@token = "12312321i"
 		@user_id = "user_id_here"
 		@user_id = "user_id_here"
 		@user = 
 		@user =