github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #207 from overleaf/jpa-fix-pending-updates-lists-processing

Browse source 
[misc] ApplyUpdateTests: process all the pending-updates-lists
This commit is contained in:
Jakob Ackermann 2021-03-02 08:53:36 +00:00 committed by GitHub
commit fbb598efaf
1 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
services/real-time/test/acceptance/js/ApplyUpdateTests.js
View file

@ -26,6 +26,38 @@ const rclient = redis.createClient(settings.redis.documentupdater)
const redisSettings = settings.redis const redisSettings = settings.redis
const PENDING_UPDATES_LIST_KEYS = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9].map((n) => {
let key = 'pending-updates-list'
if (n !== 0) {
key += `-${n}`
}
return key
})
function getPendingUpdatesList(cb) {
Promise.all(
PENDING_UPDATES_LIST_KEYS.map((key) => rclient.lrange(key, 0, -1))
)
.then((results) => {
cb(
null,
results.reduce((acc, more) => {
if (more.length) {
acc.push(...more)
}
return acc
}, [])
)
})
.catch(cb)
}
function clearPendingUpdatesList(cb) {
Promise.all(PENDING_UPDATES_LIST_KEYS.map((key) => rclient.del(key)))
.then(() => cb(null))
.catch(cb)
}
describe('applyOtUpdate', function () { describe('applyOtUpdate', function () {
before(function () { before(function () {
return (this.update = { return (this.update = {
@ -91,7 +123,7 @@ describe('applyOtUpdate', function () {
}) })
it('should push the doc into the pending updates list', function (done) { it('should push the doc into the pending updates list', function (done) {
rclient.lrange('pending-updates-list', 0, -1, (error, ...rest) => { getPendingUpdatesList((error, ...rest) => {
const [doc_id] = Array.from(rest[0]) const [doc_id] = Array.from(rest[0])
doc_id.should.equal(`${this.project_id}:${this.doc_id}`) doc_id.should.equal(`${this.project_id}:${this.doc_id}`)
return done() return done()
@ -123,7 +155,7 @@ describe('applyOtUpdate', function () {
return after(function (done) { return after(function (done) {
return async.series( return async.series(
[ [
(cb) => rclient.del('pending-updates-list', cb), (cb) => clearPendingUpdatesList(cb),
(cb) => (cb) =>
rclient.del( rclient.del(
'DocsWithPendingUpdates', 'DocsWithPendingUpdates',
@ -393,7 +425,7 @@ describe('applyOtUpdate', function () {
}) })
it('should push the doc into the pending updates list', function (done) { it('should push the doc into the pending updates list', function (done) {
rclient.lrange('pending-updates-list', 0, -1, (error, ...rest) => { getPendingUpdatesList((error, ...rest) => {
const [doc_id] = Array.from(rest[0]) const [doc_id] = Array.from(rest[0])
doc_id.should.equal(`${this.project_id}:${this.doc_id}`) doc_id.should.equal(`${this.project_id}:${this.doc_id}`)
return done() return done()
@ -425,7 +457,7 @@ describe('applyOtUpdate', function () {
return after(function (done) { return after(function (done) {
return async.series( return async.series(
[ [
(cb) => rclient.del('pending-updates-list', cb), (cb) => clearPendingUpdatesList(cb),
(cb) => (cb) =>
rclient.del( rclient.del(
'DocsWithPendingUpdates', 'DocsWithPendingUpdates',