From 47e0cb44cedfe8bff8391bf297c49b9f505fbbe2 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 30 May 2019 10:29:34 +0100 Subject: [PATCH 1/2] bump redis to 1.0.8 --- services/real-time/npm-shrinkwrap.json | 41 ++++++++++++++++++++------ services/real-time/package.json | 2 +- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/services/real-time/npm-shrinkwrap.json b/services/real-time/npm-shrinkwrap.json index 95656f81fd..4c0e2a0f85 100644 --- a/services/real-time/npm-shrinkwrap.json +++ b/services/real-time/npm-shrinkwrap.json @@ -1394,24 +1394,47 @@ } }, "redis-sharelatex": { - "version": "1.0.6", - "from": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.6", - "resolved": "git+https://github.com/sharelatex/redis-sharelatex.git#0992345e17d204066654260ad718170bbd1018d6", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.8.tgz", + "integrity": "sha512-X88/tG03NKWoy0uMzTrzARvILaFj9ZoKGhECtjf8N7GeCzo90zCeT0cVIJCVHeECogXCxBRf/ABFUBBQKUOCew==", + "requires": { + "async": "^2.5.0", + "coffee-script": "1.8.0", + "ioredis": "~4.9.1", + "redis-sentinel": "0.1.1", + "underscore": "1.7.0" + }, "dependencies": { "async": { "version": "2.6.2", - "from": "async@>=2.5.0 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz" + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", + "requires": { + "lodash": "^4.17.11" + } }, "coffee-script": { "version": "1.8.0", - "from": "coffee-script@1.8.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz" + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", + "integrity": "sha1-nJ8dK0pSoADe0Vtll5FwNkgmPB0=", + "requires": { + "mkdirp": "~0.3.5" + } + }, + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" }, "mkdirp": { "version": "0.3.5", - "from": "mkdirp@>=0.3.5 <0.4.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=" + }, + "underscore": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", + "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=" } } }, diff --git a/services/real-time/package.json b/services/real-time/package.json index 60a978f3b5..3c8a05591a 100644 --- a/services/real-time/package.json +++ b/services/real-time/package.json @@ -30,7 +30,7 @@ "express-session": "^1.9.1", "logger-sharelatex": "^1.6.0", "metrics-sharelatex": "^2.1.1", - "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.6", + "redis-sharelatex": "^1.0.8", "request": "^2.88.0", "session.socket.io": "^0.1.6", "settings-sharelatex": "^1.1.0", From 2c9b222437dbb26d3217f52046ce61fb3785ad5b Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 30 May 2019 10:58:05 +0100 Subject: [PATCH 2/2] fix breaking tests from using ioredis with inbuilt promises because a promise is returned from ioredis it errors in mocha as it can't take a promise and a callback --- .../test/acceptance/coffee/ApplyUpdateTests.coffee | 9 +++++++-- .../real-time/test/acceptance/coffee/SessionTests.coffee | 5 +++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/services/real-time/test/acceptance/coffee/ApplyUpdateTests.coffee b/services/real-time/test/acceptance/coffee/ApplyUpdateTests.coffee index d9addc990d..842e4fcc4c 100644 --- a/services/real-time/test/acceptance/coffee/ApplyUpdateTests.coffee +++ b/services/real-time/test/acceptance/coffee/ApplyUpdateTests.coffee @@ -48,6 +48,7 @@ describe "applyOtUpdate", -> rclient.lrange "pending-updates-list", 0, -1, (error, [doc_id]) => doc_id.should.equal "#{@project_id}:#{@doc_id}" done() + return null it "should push the update into redis", (done) -> rclient.lrange redisSettings.documentupdater.key_schema.pendingUpdates({@doc_id}), 0, -1, (error, [update]) => @@ -58,7 +59,8 @@ describe "applyOtUpdate", -> user_id: @user_id } done() - + return null + after (done) -> async.series [ (cb) => rclient.del "pending-updates-list", cb @@ -107,6 +109,7 @@ describe "applyOtUpdate", -> rclient.llen redisSettings.documentupdater.key_schema.pendingUpdates({@doc_id}), (error, len) => len.should.equal 0 done() + return null describe "when authorized to read-only with a comment update", -> before (done) -> @@ -142,6 +145,7 @@ describe "applyOtUpdate", -> rclient.lrange "pending-updates-list", 0, -1, (error, [doc_id]) => doc_id.should.equal "#{@project_id}:#{@doc_id}" done() + return null it "should push the update into redis", (done) -> rclient.lrange redisSettings.documentupdater.key_schema.pendingUpdates({@doc_id}), 0, -1, (error, [update]) => @@ -152,7 +156,8 @@ describe "applyOtUpdate", -> user_id: @user_id } done() - + return null + after (done) -> async.series [ (cb) => rclient.del "pending-updates-list", cb diff --git a/services/real-time/test/acceptance/coffee/SessionTests.coffee b/services/real-time/test/acceptance/coffee/SessionTests.coffee index fa5378a1f5..23c4e78ce9 100644 --- a/services/real-time/test/acceptance/coffee/SessionTests.coffee +++ b/services/real-time/test/acceptance/coffee/SessionTests.coffee @@ -12,8 +12,9 @@ describe "Session", -> }, (error) => throw error if error? @client = RealTimeClient.connect() - done() - + return done() + return null + it "should not get disconnected", (done) -> disconnected = false @client.on "disconnect", () ->