diff --git a/services/project-history/test/acceptance/js/DiscardingUpdatesTests.js b/services/project-history/test/acceptance/js/DiscardingUpdatesTests.js index c5436af974..c86db7acd8 100644 --- a/services/project-history/test/acceptance/js/DiscardingUpdatesTests.js +++ b/services/project-history/test/acceptance/js/DiscardingUpdatesTests.js @@ -1,20 +1,3 @@ -/* eslint-disable - no-undef, - no-unused-vars, -*/ -// TODO: This file was created by bulk-decaffeinate. -// Fix any style issues and re-enable lint. -/* - * decaffeinate suggestions: - * DS102: Remove unnecessary code created because of implicit returns - * DS207: Consider shorter variations of null checks - * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md - */ -import async from 'async' -import sinon from 'sinon' -import { expect } from 'chai' -import Settings from '@overleaf/settings' -import assert from 'node:assert' import mongodb from 'mongodb-legacy' import nock from 'nock' import * as ProjectHistoryClient from './helpers/ProjectHistoryClient.js' @@ -25,49 +8,31 @@ const MockHistoryStore = () => nock('http://127.0.0.1:3100') const MockWeb = () => nock('http://127.0.0.1:3000') describe('DiscardingUpdates', function () { - beforeEach(function (done) { + beforeEach(async function () { this.timestamp = new Date() - return ProjectHistoryApp.ensureRunning(error => { - if (error != null) { - throw error - } - this.user_id = new ObjectId().toString() - this.project_id = new ObjectId().toString() - this.doc_id = new ObjectId().toString() + await ProjectHistoryApp.promises.ensureRunning() + this.user_id = new ObjectId().toString() + this.project_id = new ObjectId().toString() + this.doc_id = new ObjectId().toString() - MockHistoryStore().post('/api/projects').reply(200, { - projectId: 0, - }) - MockWeb() - .get(`/project/${this.project_id}/details`) - .reply(200, { name: 'Test Project' }) - return ProjectHistoryClient.initializeProject(this.project_id, done) + MockHistoryStore().post('/api/projects').reply(200, { + projectId: 0, }) + MockWeb() + .get(`/project/${this.project_id}/details`) + .reply(200, { name: 'Test Project' }) + await ProjectHistoryClient.promises.initializeProject(this.project_id) }) - return it('should discard updates', function (done) { - return async.series( - [ - cb => { - const update = { - pathname: '/main.tex', - docLines: 'a\nb', - doc: this.doc_id, - meta: { user_id: this.user_id, ts: new Date() }, - } - return ProjectHistoryClient.pushRawUpdate(this.project_id, update, cb) - }, - cb => { - return ProjectHistoryClient.flushProject(this.project_id, cb) - }, - ], - error => { - if (error != null) { - throw error - } - return done() - } - ) + it('should discard updates', async function () { + const update = { + pathname: '/main.tex', + docLines: 'a\nb', + doc: this.doc_id, + meta: { user_id: this.user_id, ts: new Date() }, + } + await ProjectHistoryClient.promises.pushRawUpdate(this.project_id, update) + await ProjectHistoryClient.promises.flushProject(this.project_id) }) }) diff --git a/services/project-history/test/acceptance/js/helpers/ProjectHistoryClient.js b/services/project-history/test/acceptance/js/helpers/ProjectHistoryClient.js index ed22e2057b..1c6f9c3451 100644 --- a/services/project-history/test/acceptance/js/helpers/ProjectHistoryClient.js +++ b/services/project-history/test/acceptance/js/helpers/ProjectHistoryClient.js @@ -363,4 +363,5 @@ export const promises = { getDump: promisify(getDump), setFailure: promisify(setFailure), getDiff: promisify(getDiff), + flushProject: promisify(flushProject), }