From 70b56d0362097c01a0d92e6fae4d40f189b07580 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 24 Sep 2018 11:32:15 +0100 Subject: [PATCH] Fix up acceptance tests --- .../web/test/acceptance/coffee/SessionTests.coffee | 13 ------------- .../test/acceptance/coffee/helpers/MockV1Api.coffee | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/services/web/test/acceptance/coffee/SessionTests.coffee b/services/web/test/acceptance/coffee/SessionTests.coffee index dff0832836..fb628c0c0c 100644 --- a/services/web/test/acceptance/coffee/SessionTests.coffee +++ b/services/web/test/acceptance/coffee/SessionTests.coffee @@ -263,21 +263,8 @@ describe "Sessions", -> @user3 = new User() @user3.email = @user1.email @user3.password = @user1.password - v1Id = 2345 - v1User2 = { - id: v1Id, - email: @user2.email, - password: @user2.password, - profile: - id: v1Id, - email: @user2.email - } async.series [ @user2.login.bind(@user2) - (cb) => @user2.mongoUpdate {$set: {'overleaf.id': v1Id}}, cb - (cb) => - MockV1Api.setUser v1Id, v1User2 - cb() @user2.activateSudoMode.bind(@user2) ], done diff --git a/services/web/test/acceptance/coffee/helpers/MockV1Api.coffee b/services/web/test/acceptance/coffee/helpers/MockV1Api.coffee index 5d98ff73b7..82e465193f 100644 --- a/services/web/test/acceptance/coffee/helpers/MockV1Api.coffee +++ b/services/web/test/acceptance/coffee/helpers/MockV1Api.coffee @@ -78,14 +78,14 @@ module.exports = MockV1Api = app.post "/api/v1/sharelatex/login", (req, res, next) => for id, user of @users - if user.email == req.body.email && user.password == req.body.password + if user? && user.email == req.body.email && user.password == req.body.password return res.json { email: user.email, valid: true, user_profile: user.profile } return res.status(403).json { - email: user.email, + email: req.body.email, valid: false }