diff --git a/services/track-changes/test/acceptance/coffee/ArchivingUpdatesTests.coffee b/services/track-changes/test/acceptance/coffee/ArchivingUpdatesTests.coffee index 973d4bde06..416b2de9d4 100644 --- a/services/track-changes/test/acceptance/coffee/ArchivingUpdatesTests.coffee +++ b/services/track-changes/test/acceptance/coffee/ArchivingUpdatesTests.coffee @@ -27,13 +27,14 @@ describe "Archiving updates", -> MockWebApi.projects[@project_id] = features: versioning: true + sinon.spy MockWebApi, "getProjectDetails" MockWebApi.users[@user_id] = @user = email: "user@sharelatex.com" first_name: "Leo" last_name: "Lion" id: @user_id - sinon.spy MockWebApi, "getUser" + sinon.spy MockWebApi, "getUserInfo" MockDocStoreApi.docs[@doc_id] = @doc = _id: @doc_id @@ -60,7 +61,7 @@ describe "Archiving updates", -> done() after (done) -> - MockWebApi.getUser.restore() + MockWebApi.getUserInfo.restore() db.docHistory.remove {project_id: ObjectId(@project_id)} TrackChangesClient.removeS3Doc @project_id, @doc_id, done diff --git a/services/track-changes/test/acceptance/coffee/GettingADiffTests.coffee b/services/track-changes/test/acceptance/coffee/GettingADiffTests.coffee index 1285177bf9..f64f42ff87 100644 --- a/services/track-changes/test/acceptance/coffee/GettingADiffTests.coffee +++ b/services/track-changes/test/acceptance/coffee/GettingADiffTests.coffee @@ -28,7 +28,7 @@ describe "Getting a diff", -> first_name: "Leo" last_name: "Lion" id: @user_id - sinon.spy MockWebApi, "getUser" + sinon.spy MockWebApi, "getUserInfo" twoMinutes = 2 * 60 * 1000 @@ -68,7 +68,7 @@ describe "Getting a diff", -> after () -> MockDocUpdaterApi.getDoc.restore() - MockWebApi.getUser.restore() + MockWebApi.getUserInfo.restore() it "should return the diff", -> expect(@diff).to.deep.equal @expected_diff diff --git a/services/track-changes/test/acceptance/coffee/GettingUpdatesTests.coffee b/services/track-changes/test/acceptance/coffee/GettingUpdatesTests.coffee index 7c94bcdc34..d01797e25f 100644 --- a/services/track-changes/test/acceptance/coffee/GettingUpdatesTests.coffee +++ b/services/track-changes/test/acceptance/coffee/GettingUpdatesTests.coffee @@ -31,7 +31,7 @@ describe "Getting updates", -> first_name: "Leo" last_name: "Lion" id: @user_id - sinon.spy MockWebApi, "getUser" + sinon.spy MockWebApi, "getUserInfo" @updates = [] for i in [0..9] @@ -52,7 +52,7 @@ describe "Getting updates", -> done() after: () -> - MockWebApi.getUser.restore() + MockWebApi.getUserInfo.restore() describe "getting updates up to the limit", -> before (done) -> @@ -62,7 +62,7 @@ describe "Getting updates", -> done() it "should fetch the user details from the web api", -> - MockWebApi.getUser + MockWebApi.getUserInfo .calledWith(@user_id) .should.equal true diff --git a/services/track-changes/test/acceptance/coffee/RestoringVersions.coffee b/services/track-changes/test/acceptance/coffee/RestoringVersions.coffee index ebe9a7795e..5dbe094cd8 100644 --- a/services/track-changes/test/acceptance/coffee/RestoringVersions.coffee +++ b/services/track-changes/test/acceptance/coffee/RestoringVersions.coffee @@ -20,7 +20,7 @@ describe "Restoring a version", -> @doc_id = ObjectId().toString() @project_id = ObjectId().toString() MockWebApi.projects[@project_id] = features: versioning: true - + minutes = 60 * 1000 @updates = [{ @@ -49,6 +49,7 @@ describe "Restoring a version", -> first_name: "Leo" last_name: "Lion" id: @user_id + MockDocUpdaterApi.docs[@doc_id] = lines: @lines version: 7 diff --git a/services/track-changes/test/acceptance/coffee/helpers/MockWebApi.coffee b/services/track-changes/test/acceptance/coffee/helpers/MockWebApi.coffee index 002d944dfd..7beb67075e 100644 --- a/services/track-changes/test/acceptance/coffee/helpers/MockWebApi.coffee +++ b/services/track-changes/test/acceptance/coffee/helpers/MockWebApi.coffee @@ -6,15 +6,15 @@ module.exports = MockWebApi = projects: {} - getUser: (user_id, callback = (error) ->) -> + getUserInfo: (user_id, callback = (error) ->) -> callback null, @users[user_id] or null - getProject: (project_id, callback = (error, project) ->) -> + getProjectDetails: (project_id, callback = (error, project) ->) -> callback null, @projects[project_id] run: () -> app.get "/user/:user_id/personal_info", (req, res, next) => - @getUser req.params.user_id, (error, user) -> + @getUserInfo req.params.user_id, (error, user) -> if error? res.send 500 if !user? @@ -23,7 +23,7 @@ module.exports = MockWebApi = res.send JSON.stringify user app.get "/project/:project_id/details", (req, res, next) => - @getProject req.params.project_id, (error, project) -> + @getProjectDetails req.params.project_id, (error, project) -> if error? res.send 500 if !project?