From 64aef0b55a7884e0e12d17ba010759f15b3a1fc4 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 27 Apr 2017 10:42:43 +0100 Subject: [PATCH] fix acceptance test to work with redis cluster too --- .../coffee/ApplyingUpdatesToADocTests.coffee | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/services/document-updater/test/acceptance/coffee/ApplyingUpdatesToADocTests.coffee b/services/document-updater/test/acceptance/coffee/ApplyingUpdatesToADocTests.coffee index abb10cc95a..d06119c690 100644 --- a/services/document-updater/test/acceptance/coffee/ApplyingUpdatesToADocTests.coffee +++ b/services/document-updater/test/acceptance/coffee/ApplyingUpdatesToADocTests.coffee @@ -7,6 +7,7 @@ Settings = require('settings-sharelatex') rclient_history = require("redis-sharelatex").createClient(Settings.redis.history) rclient_du = require("redis-sharelatex").createClient(Settings.redis.documentupdater) Keys = Settings.redis.documentupdater.key_schema +HistoryKeys = Settings.redis.history.key_schema MockTrackChangesApi = require "./helpers/MockTrackChangesApi" MockWebApi = require "./helpers/MockWebApi" @@ -49,10 +50,10 @@ describe "Applying updates to a doc", -> done() it "should push the applied updates to the track changes api", (done) -> - rclient_history.lrange "UncompressedHistoryOps:#{@doc_id}", 0, -1, (error, updates) => + rclient_history.lrange HistoryKeys.uncompressedHistoryOps({@doc_id}), 0, -1, (error, updates) => throw error if error? JSON.parse(updates[0]).op.should.deep.equal @update.op - rclient_history.sismember "DocsWithHistoryOps:#{@project_id}", @doc_id, (error, result) => + rclient_history.sismember HistoryKeys.docsWithHistoryOps({@project_id}), @doc_id, (error, result) => throw error if error? result.should.equal 1 done() @@ -82,9 +83,9 @@ describe "Applying updates to a doc", -> done() it "should push the applied updates to the track changes api", (done) -> - rclient_history.lrange "UncompressedHistoryOps:#{@doc_id}", 0, -1, (error, updates) => + rclient_history.lrange HistoryKeys.uncompressedHistoryOps({@doc_id}), 0, -1, (error, updates) => JSON.parse(updates[0]).op.should.deep.equal @update.op - rclient_history.sismember "DocsWithHistoryOps:#{@project_id}", @doc_id, (error, result) => + rclient_history.sismember HistoryKeys.docsWithHistoryOps({@project_id}), @doc_id, (error, result) => result.should.equal 1 done() @@ -127,12 +128,12 @@ describe "Applying updates to a doc", -> done() it "should push the applied updates to the track changes api", (done) -> - rclient_history.lrange "UncompressedHistoryOps:#{@doc_id}", 0, -1, (error, updates) => + rclient_history.lrange HistoryKeys.uncompressedHistoryOps({@doc_id}), 0, -1, (error, updates) => updates = (JSON.parse(u) for u in updates) for appliedUpdate, i in @updates appliedUpdate.op.should.deep.equal updates[i].op - rclient_history.sismember "DocsWithHistoryOps:#{@project_id}", @doc_id, (error, result) => + rclient_history.sismember HistoryKeys.docsWithHistoryOps({@project_id}), @doc_id, (error, result) => result.should.equal 1 done()