From 095ac313476725c5b177bdb740a5801fb935f139 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Thu, 24 Aug 2017 14:32:27 +0100 Subject: [PATCH 1/6] wip: updating to node 6 --- services/track-changes/.nvmrc | 2 +- .../app/coffee/WebApiManager.coffee | 1 + services/track-changes/npm-shrinkwrap.json | 2258 ----------------- services/track-changes/package.json | 25 +- .../unit/coffee/DocArchive/MongoAWS.coffee | 2 +- .../DocumentUpdaterManagerTests.coffee | 8 +- .../LockManager/LockManagerTests.coffee | 2 +- .../PackManager/PackManagerTests.coffee | 8 +- .../UpdatesManager/UpdatesManagerTests.coffee | 14 +- .../WebApiManager/WebApiManagerTests.coffee | 8 +- 10 files changed, 38 insertions(+), 2290 deletions(-) delete mode 100644 services/track-changes/npm-shrinkwrap.json diff --git a/services/track-changes/.nvmrc b/services/track-changes/.nvmrc index 994fe99096..e18a34b9d6 100644 --- a/services/track-changes/.nvmrc +++ b/services/track-changes/.nvmrc @@ -1 +1 @@ -0.10.22 \ No newline at end of file +6.11.2 diff --git a/services/track-changes/app/coffee/WebApiManager.coffee b/services/track-changes/app/coffee/WebApiManager.coffee index aee8d431dd..a95808deee 100644 --- a/services/track-changes/app/coffee/WebApiManager.coffee +++ b/services/track-changes/app/coffee/WebApiManager.coffee @@ -30,6 +30,7 @@ module.exports = WebApiManager = return callback null, body else error = new Error("web returned a non-success status code: #{res.statusCode} (attempts: #{res.attempts})") + console.log error.message callback error getUserInfo: (user_id, callback = (error, userInfo) ->) -> diff --git a/services/track-changes/npm-shrinkwrap.json b/services/track-changes/npm-shrinkwrap.json deleted file mode 100644 index ae4842c5d1..0000000000 --- a/services/track-changes/npm-shrinkwrap.json +++ /dev/null @@ -1,2258 +0,0 @@ -{ - "name": "history-sharelatex", - "version": "0.1.4", - "dependencies": { - "async": { - "version": "0.2.10", - "from": "async@~0.2.10" - }, - "bson": { - "version": "0.4.23", - "from": "bson@^0.4.20" - }, - "byline": { - "version": "4.2.2", - "from": "byline@^4.2.1" - }, - "cli": { - "version": "0.6.6", - "from": "cli@^0.6.6", - "dependencies": { - "glob": { - "version": "3.2.11", - "from": "glob@~ 3.2.1", - "dependencies": { - "inherits": { - "version": "2.0.3", - "from": "inherits@~2.0.1" - }, - "minimatch": { - "version": "0.3.0", - "from": "minimatch@0.3", - "dependencies": { - "lru-cache": { - "version": "2.7.3", - "from": "lru-cache@2" - }, - "sigmund": { - "version": "1.0.1", - "from": "sigmund@~1.0.0" - } - } - } - } - }, - "exit": { - "version": "0.1.2", - "from": "exit@0.1.2" - } - } - }, - "express": { - "version": "3.3.5", - "from": "express@3.3.5", - "resolved": "https://registry.npmjs.org/express/-/express-3.3.5.tgz", - "dependencies": { - "connect": { - "version": "2.8.5", - "from": "connect@2.8.5", - "dependencies": { - "qs": { - "version": "0.6.5", - "from": "qs@0.6.5" - }, - "formidable": { - "version": "1.0.14", - "from": "formidable@1.0.14" - }, - "bytes": { - "version": "0.2.0", - "from": "bytes@0.2.0" - }, - "pause": { - "version": "0.0.1", - "from": "pause@0.0.1" - }, - "uid2": { - "version": "0.0.2", - "from": "uid2@0.0.2" - } - } - }, - "commander": { - "version": "1.2.0", - "from": "commander@1.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-1.2.0.tgz", - "dependencies": { - "keypress": { - "version": "0.1.0", - "from": "keypress@0.1.x" - } - } - }, - "range-parser": { - "version": "0.0.4", - "from": "range-parser@0.0.4" - }, - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@0.3.x" - }, - "cookie": { - "version": "0.1.0", - "from": "cookie@0.1.0" - }, - "buffer-crc32": { - "version": "0.2.1", - "from": "buffer-crc32@0.2.1" - }, - "fresh": { - "version": "0.2.0", - "from": "fresh@0.2.0" - }, - "methods": { - "version": "0.0.1", - "from": "methods@0.0.1" - }, - "send": { - "version": "0.1.4", - "from": "send@0.1.4", - "dependencies": { - "mime": { - "version": "1.2.11", - "from": "mime@~1.2.9" - } - } - }, - "cookie-signature": { - "version": "1.0.1", - "from": "cookie-signature@1.0.1" - }, - "debug": { - "version": "2.6.3", - "from": "debug@*", - "dependencies": { - "ms": { - "version": "0.7.2", - "from": "ms@0.7.2" - } - } - } - } - }, - "line-reader": { - "version": "0.2.4", - "from": "line-reader@^0.2.4" - }, - "mongojs": { - "version": "1.4.1", - "from": "mongojs@^1.4.1", - "dependencies": { - "each-series": { - "version": "1.0.0", - "from": "each-series@^1.0.0" - }, - "mongodb-core": { - "version": "1.3.22-alpha4", - "from": "mongodb-core@^1.2.8", - "dependencies": { - "require_optional": { - "version": "1.0.0", - "from": "require_optional@~1.0.0", - "dependencies": { - "semver": { - "version": "5.3.0", - "from": "semver@^5.1.0" - }, - "resolve-from": { - "version": "2.0.0", - "from": "resolve-from@^2.0.0" - } - } - } - } - }, - "once": { - "version": "1.4.0", - "from": "once@^1.3.2", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "parse-mongo-url": { - "version": "1.1.1", - "from": "parse-mongo-url@^1.1.0" - }, - "pump": { - "version": "1.0.2", - "from": "pump@^1.0.0", - "dependencies": { - "end-of-stream": { - "version": "1.4.0", - "from": "end-of-stream@^1.1.0" - } - } - }, - "readable-stream": { - "version": "2.2.6", - "from": "readable-stream@^2.0.2", - "dependencies": { - "buffer-shims": { - "version": "1.0.0", - "from": "buffer-shims@^1.0.0" - }, - "core-util-is": { - "version": "1.0.2", - "from": "core-util-is@~1.0.0" - }, - "isarray": { - "version": "1.0.0", - "from": "isarray@~1.0.0" - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@~2.0.1" - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "process-nextick-args@~1.0.6" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@~0.10.x" - }, - "util-deprecate": { - "version": "1.0.2", - "from": "util-deprecate@~1.0.1" - } - } - }, - "thunky": { - "version": "0.1.0", - "from": "thunky@^0.1.0" - }, - "to-mongodb-core": { - "version": "2.0.0", - "from": "to-mongodb-core@^2.0.0" - }, - "xtend": { - "version": "4.0.1", - "from": "xtend@^4.0.0" - } - } - }, - "settings-sharelatex": { - "version": "1.0.0", - "from": "settings-sharelatex@git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", - "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559", - "dependencies": { - "coffee-script": { - "version": "1.6.0", - "from": "coffee-script@1.6.0" - } - } - }, - "logger-sharelatex": { - "version": "1.5.6", - "from": "logger-sharelatex@git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6", - "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#b2956ec56b582b9f4fc8fdda8dc00c06e77c5537", - "dependencies": { - "bunyan": { - "version": "1.5.1", - "from": "bunyan@1.5.1", - "dependencies": { - "dtrace-provider": { - "version": "0.6.0", - "from": "dtrace-provider@~0.6", - "dependencies": { - "nan": { - "version": "2.5.1", - "from": "nan@^2.0.8" - } - } - }, - "mv": { - "version": "2.1.1", - "from": "mv@~2", - "dependencies": { - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@~0.5.1", - "dependencies": { - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8" - } - } - }, - "ncp": { - "version": "2.0.0", - "from": "ncp@~2.0.0" - }, - "rimraf": { - "version": "2.4.5", - "from": "rimraf@~2.4.0", - "dependencies": { - "glob": { - "version": "6.0.4", - "from": "glob@^6.0.1", - "dependencies": { - "inflight": { - "version": "1.0.6", - "from": "inflight@^1.0.4", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@2" - }, - "minimatch": { - "version": "3.0.3", - "from": "minimatch@2 || 3", - "dependencies": { - "brace-expansion": { - "version": "1.1.6", - "from": "brace-expansion@^1.0.0", - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@^0.4.1" - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1" - } - } - } - } - }, - "once": { - "version": "1.4.0", - "from": "once@^1.3.0", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "from": "path-is-absolute@^1.0.0" - } - } - } - } - } - } - }, - "safe-json-stringify": { - "version": "1.0.4", - "from": "safe-json-stringify@~1" - } - } - }, - "coffee-script": { - "version": "1.12.4", - "from": "coffee-script@1.12.4", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz" - }, - "grunt-contrib-clean": { - "version": "0.6.0", - "from": "grunt-contrib-clean@^0.6.0", - "dependencies": { - "rimraf": { - "version": "2.2.8", - "from": "rimraf@~2.2.1" - } - } - }, - "grunt-contrib-coffee": { - "version": "0.11.1", - "from": "grunt-contrib-coffee@^0.11.0", - "dependencies": { - "coffee-script": { - "version": "1.7.1", - "from": "coffee-script@~1.7.0", - "dependencies": { - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@~0.3.5" - } - } - }, - "chalk": { - "version": "0.5.1", - "from": "chalk@~0.5.0", - "dependencies": { - "ansi-styles": { - "version": "1.1.0", - "from": "ansi-styles@^1.1.0" - }, - "escape-string-regexp": { - "version": "1.0.5", - "from": "escape-string-regexp@^1.0.0" - }, - "has-ansi": { - "version": "0.1.0", - "from": "has-ansi@^0.1.0", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@^0.2.1" - } - } - }, - "strip-ansi": { - "version": "0.3.0", - "from": "strip-ansi@^0.3.0", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@^0.2.1" - } - } - }, - "supports-color": { - "version": "0.2.0", - "from": "supports-color@^0.2.0" - } - } - }, - "lodash": { - "version": "2.4.2", - "from": "lodash@~2.4.1" - } - } - }, - "grunt-execute": { - "version": "0.2.2", - "from": "grunt-execute@^0.2.2" - }, - "grunt-mocha-test": { - "version": "0.11.0", - "from": "grunt-mocha-test@^0.11.0", - "dependencies": { - "mocha": { - "version": "1.20.1", - "from": "mocha@~1.20.0", - "dependencies": { - "commander": { - "version": "2.0.0", - "from": "commander@2.0.0" - }, - "growl": { - "version": "1.7.0", - "from": "growl@1.7.x" - }, - "jade": { - "version": "0.26.3", - "from": "jade@0.26.3", - "dependencies": { - "commander": { - "version": "0.6.1", - "from": "commander@0.6.1" - }, - "mkdirp": { - "version": "0.3.0", - "from": "mkdirp@0.3.0" - } - } - }, - "diff": { - "version": "1.0.7", - "from": "diff@1.0.7" - }, - "debug": { - "version": "2.6.3", - "from": "debug@*", - "dependencies": { - "ms": { - "version": "0.7.2", - "from": "ms@0.7.2" - } - } - }, - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@0.3.5" - }, - "glob": { - "version": "3.2.3", - "from": "glob@3.2.3", - "dependencies": { - "minimatch": { - "version": "0.2.14", - "from": "minimatch@~0.2.11", - "dependencies": { - "lru-cache": { - "version": "2.7.3", - "from": "lru-cache@2" - }, - "sigmund": { - "version": "1.0.1", - "from": "sigmund@~1.0.0" - } - } - }, - "graceful-fs": { - "version": "2.0.3", - "from": "graceful-fs@~2.0.0" - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@2" - } - } - } - } - }, - "hooker": { - "version": "0.2.3", - "from": "hooker@~0.2.3" - }, - "fs-extra": { - "version": "0.9.1", - "from": "fs-extra@~0.9.1", - "dependencies": { - "ncp": { - "version": "0.5.1", - "from": "ncp@^0.5.1" - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@^0.5.0", - "dependencies": { - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8" - } - } - }, - "jsonfile": { - "version": "1.1.1", - "from": "jsonfile@~1.1.0" - }, - "rimraf": { - "version": "2.6.1", - "from": "rimraf@^2.2.8", - "dependencies": { - "glob": { - "version": "7.1.1", - "from": "glob@^7.0.5", - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "from": "fs.realpath@^1.0.0" - }, - "inflight": { - "version": "1.0.6", - "from": "inflight@^1.0.4", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@2" - }, - "minimatch": { - "version": "3.0.3", - "from": "minimatch@^3.0.2", - "dependencies": { - "brace-expansion": { - "version": "1.1.6", - "from": "brace-expansion@^1.0.0", - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@^0.4.1" - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1" - } - } - } - } - }, - "once": { - "version": "1.4.0", - "from": "once@^1.3.0", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "from": "path-is-absolute@^1.0.0" - } - } - } - } - } - } - } - } - }, - "raven": { - "version": "1.2.0", - "from": "raven@^1.1.3", - "dependencies": { - "cookie": { - "version": "0.3.1", - "from": "cookie@0.3.1" - }, - "json-stringify-safe": { - "version": "5.0.1", - "from": "json-stringify-safe@5.0.1" - }, - "lsmod": { - "version": "1.0.0", - "from": "lsmod@1.0.0" - }, - "uuid": { - "version": "3.0.0", - "from": "uuid@3.0.0" - }, - "stack-trace": { - "version": "0.0.9", - "from": "stack-trace@0.0.9" - } - } - }, - "timekeeper": { - "version": "1.0.0", - "from": "timekeeper@^1.0.0" - } - } - }, - "metrics-sharelatex": { - "version": "1.7.1", - "from": "metrics-sharelatex@git+https://github.com/sharelatex/metrics-sharelatex.git#v1.7.1", - "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#166961924c599b1f9468f2e17846fa2a9d12372d", - "dependencies": { - "lynx": { - "version": "0.1.1", - "from": "lynx@~0.1.1", - "dependencies": { - "mersenne": { - "version": "0.0.3", - "from": "mersenne@~0.0.3" - }, - "statsd-parser": { - "version": "0.0.4", - "from": "statsd-parser@~0.0.4" - } - } - }, - "coffee-script": { - "version": "1.6.0", - "from": "coffee-script@1.6.0" - }, - "underscore": { - "version": "1.6.0", - "from": "underscore@~1.6.0" - } - } - }, - "request": { - "version": "2.33.0", - "from": "request@~2.33.0", - "dependencies": { - "qs": { - "version": "0.6.6", - "from": "qs@~0.6.0" - }, - "json-stringify-safe": { - "version": "5.0.1", - "from": "json-stringify-safe@~5.0.0" - }, - "forever-agent": { - "version": "0.5.2", - "from": "forever-agent@~0.5.0" - }, - "node-uuid": { - "version": "1.4.8", - "from": "node-uuid@~1.4.0" - }, - "mime": { - "version": "1.2.11", - "from": "mime@~1.2.9" - }, - "tough-cookie": { - "version": "2.3.2", - "from": "tough-cookie@>=0.12.0", - "dependencies": { - "punycode": { - "version": "1.4.1", - "from": "punycode@^1.4.1" - } - } - }, - "form-data": { - "version": "0.1.4", - "from": "form-data@~0.1.0", - "dependencies": { - "combined-stream": { - "version": "0.0.7", - "from": "combined-stream@~0.0.4", - "dependencies": { - "delayed-stream": { - "version": "0.0.5", - "from": "delayed-stream@0.0.5" - } - } - }, - "async": { - "version": "0.9.2", - "from": "async@~0.9.0" - } - } - }, - "tunnel-agent": { - "version": "0.3.0", - "from": "tunnel-agent@~0.3.0" - }, - "http-signature": { - "version": "0.10.1", - "from": "http-signature@~0.10.0", - "dependencies": { - "assert-plus": { - "version": "0.1.5", - "from": "assert-plus@^0.1.5" - }, - "asn1": { - "version": "0.1.11", - "from": "asn1@0.1.11" - }, - "ctype": { - "version": "0.5.3", - "from": "ctype@0.5.3" - } - } - }, - "oauth-sign": { - "version": "0.3.0", - "from": "oauth-sign@~0.3.0" - }, - "hawk": { - "version": "1.0.0", - "from": "hawk@~1.0.0", - "dependencies": { - "hoek": { - "version": "0.9.1", - "from": "hoek@0.9.x" - }, - "boom": { - "version": "0.4.2", - "from": "boom@0.4.x" - }, - "cryptiles": { - "version": "0.2.2", - "from": "cryptiles@0.2.x" - }, - "sntp": { - "version": "0.2.4", - "from": "sntp@0.2.x" - } - } - }, - "aws-sign2": { - "version": "0.5.0", - "from": "aws-sign2@~0.5.0" - } - } - }, - "requestretry": { - "version": "1.12.0", - "from": "requestretry@^1.12.0", - "dependencies": { - "extend": { - "version": "3.0.0", - "from": "extend@^3.0.0" - }, - "lodash": { - "version": "4.17.4", - "from": "lodash@^4.15.0" - }, - "request": { - "version": "2.81.0", - "from": "request@^2.74.0", - "dependencies": { - "aws-sign2": { - "version": "0.6.0", - "from": "aws-sign2@~0.6.0" - }, - "aws4": { - "version": "1.6.0", - "from": "aws4@^1.2.1" - }, - "caseless": { - "version": "0.12.0", - "from": "caseless@~0.12.0" - }, - "combined-stream": { - "version": "1.0.5", - "from": "combined-stream@~1.0.5", - "dependencies": { - "delayed-stream": { - "version": "1.0.0", - "from": "delayed-stream@~1.0.0" - } - } - }, - "forever-agent": { - "version": "0.6.1", - "from": "forever-agent@~0.6.1" - }, - "form-data": { - "version": "2.1.2", - "from": "form-data@~2.1.1", - "dependencies": { - "asynckit": { - "version": "0.4.0", - "from": "asynckit@^0.4.0" - } - } - }, - "har-validator": { - "version": "4.2.1", - "from": "har-validator@~4.2.1", - "dependencies": { - "ajv": { - "version": "4.11.5", - "from": "ajv@^4.9.1", - "dependencies": { - "co": { - "version": "4.6.0", - "from": "co@^4.6.0" - }, - "json-stable-stringify": { - "version": "1.0.1", - "from": "json-stable-stringify@^1.0.1", - "dependencies": { - "jsonify": { - "version": "0.0.0", - "from": "jsonify@~0.0.0" - } - } - } - } - }, - "har-schema": { - "version": "1.0.5", - "from": "har-schema@^1.0.5" - } - } - }, - "hawk": { - "version": "3.1.3", - "from": "hawk@~3.1.3", - "dependencies": { - "hoek": { - "version": "2.16.3", - "from": "hoek@2.x.x" - }, - "boom": { - "version": "2.10.1", - "from": "boom@2.x.x" - }, - "cryptiles": { - "version": "2.0.5", - "from": "cryptiles@2.x.x" - }, - "sntp": { - "version": "1.0.9", - "from": "sntp@1.x.x" - } - } - }, - "http-signature": { - "version": "1.1.1", - "from": "http-signature@~1.1.0", - "dependencies": { - "assert-plus": { - "version": "0.2.0", - "from": "assert-plus@^0.2.0" - }, - "jsprim": { - "version": "1.4.0", - "from": "jsprim@^1.2.2", - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "from": "assert-plus@1.0.0" - }, - "extsprintf": { - "version": "1.0.2", - "from": "extsprintf@1.0.2" - }, - "json-schema": { - "version": "0.2.3", - "from": "json-schema@0.2.3" - }, - "verror": { - "version": "1.3.6", - "from": "verror@1.3.6" - } - } - }, - "sshpk": { - "version": "1.11.0", - "from": "sshpk@^1.7.0", - "dependencies": { - "asn1": { - "version": "0.2.3", - "from": "asn1@~0.2.3" - }, - "assert-plus": { - "version": "1.0.0", - "from": "assert-plus@^1.0.0" - }, - "dashdash": { - "version": "1.14.1", - "from": "dashdash@^1.12.0" - }, - "getpass": { - "version": "0.1.6", - "from": "getpass@^0.1.1" - }, - "jsbn": { - "version": "0.1.1", - "from": "jsbn@~0.1.0" - }, - "tweetnacl": { - "version": "0.14.5", - "from": "tweetnacl@~0.14.0" - }, - "jodid25519": { - "version": "1.0.2", - "from": "jodid25519@^1.0.0" - }, - "ecc-jsbn": { - "version": "0.1.1", - "from": "ecc-jsbn@~0.1.1" - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "from": "bcrypt-pbkdf@^1.0.0" - } - } - } - } - }, - "is-typedarray": { - "version": "1.0.0", - "from": "is-typedarray@~1.0.0" - }, - "isstream": { - "version": "0.1.2", - "from": "isstream@~0.1.2" - }, - "json-stringify-safe": { - "version": "5.0.1", - "from": "json-stringify-safe@~5.0.1" - }, - "mime-types": { - "version": "2.1.15", - "from": "mime-types@~2.1.7", - "dependencies": { - "mime-db": { - "version": "1.27.0", - "from": "mime-db@~1.27.0" - } - } - }, - "oauth-sign": { - "version": "0.8.2", - "from": "oauth-sign@~0.8.1" - }, - "performance-now": { - "version": "0.2.0", - "from": "performance-now@^0.2.0" - }, - "qs": { - "version": "6.4.0", - "from": "qs@~6.4.0" - }, - "safe-buffer": { - "version": "5.0.1", - "from": "safe-buffer@^5.0.1" - }, - "stringstream": { - "version": "0.0.5", - "from": "stringstream@~0.0.4" - }, - "tough-cookie": { - "version": "2.3.2", - "from": "tough-cookie@~2.3.0", - "dependencies": { - "punycode": { - "version": "1.4.1", - "from": "punycode@^1.4.1" - } - } - }, - "tunnel-agent": { - "version": "0.6.0", - "from": "tunnel-agent@^0.6.0" - }, - "uuid": { - "version": "3.0.1", - "from": "uuid@^3.0.0" - } - } - }, - "when": { - "version": "3.7.8", - "from": "when@^3.7.7" - } - } - }, - "redis-sharelatex": { - "version": "1.0.2", - "from": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.2", - "resolved": "git+https://github.com/sharelatex/redis-sharelatex.git#143b7eb192675f36d835080e534a4ac4899f918a", - "dependencies": { - "async": { - "version": "2.4.0", - "from": "async@>=2.4.0 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz", - "dependencies": { - "lodash": { - "version": "4.17.4", - "from": "lodash@>=4.14.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" - } - } - }, - "chai": { - "version": "1.9.1", - "from": "chai@1.9.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-1.9.1.tgz", - "dependencies": { - "assertion-error": { - "version": "1.0.0", - "from": "assertion-error@1.0.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz" - }, - "deep-eql": { - "version": "0.1.3", - "from": "deep-eql@0.1.3", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", - "dependencies": { - "type-detect": { - "version": "0.1.1", - "from": "type-detect@0.1.1", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz" - } - } - } - } - }, - "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", - "dependencies": { - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@>=0.3.5 <0.4.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" - } - } - }, - "grunt-contrib-coffee": { - "version": "0.11.1", - "from": "grunt-contrib-coffee@0.11.1", - "resolved": "https://registry.npmjs.org/grunt-contrib-coffee/-/grunt-contrib-coffee-0.11.1.tgz", - "dependencies": { - "coffee-script": { - "version": "1.7.1", - "from": "coffee-script@>=1.7.0 <1.8.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", - "dependencies": { - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@>=0.3.5 <0.4.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" - } - } - }, - "chalk": { - "version": "0.5.1", - "from": "chalk@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "dependencies": { - "ansi-styles": { - "version": "1.1.0", - "from": "ansi-styles@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" - }, - "escape-string-regexp": { - "version": "1.0.5", - "from": "escape-string-regexp@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - }, - "has-ansi": { - "version": "0.1.0", - "from": "has-ansi@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "strip-ansi": { - "version": "0.3.0", - "from": "strip-ansi@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "from": "ansi-regex@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - } - } - }, - "supports-color": { - "version": "0.2.0", - "from": "supports-color@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" - } - } - }, - "lodash": { - "version": "2.4.2", - "from": "lodash@>=2.4.1 <2.5.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" - } - } - }, - "grunt-mocha-test": { - "version": "0.12.0", - "from": "grunt-mocha-test@0.12.0", - "resolved": "https://registry.npmjs.org/grunt-mocha-test/-/grunt-mocha-test-0.12.0.tgz", - "dependencies": { - "hooker": { - "version": "0.2.3", - "from": "hooker@>=0.2.3 <0.3.0", - "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" - }, - "fs-extra": { - "version": "0.11.1", - "from": "fs-extra@>=0.11.1 <0.12.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.11.1.tgz", - "dependencies": { - "ncp": { - "version": "0.6.0", - "from": "ncp@>=0.6.0 <0.7.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz" - }, - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "dependencies": { - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" - } - } - }, - "jsonfile": { - "version": "2.4.0", - "from": "jsonfile@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "dependencies": { - "graceful-fs": { - "version": "4.1.11", - "from": "graceful-fs@>=4.1.6 <5.0.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz" - } - } - }, - "rimraf": { - "version": "2.6.1", - "from": "rimraf@>=2.2.8 <3.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "dependencies": { - "glob": { - "version": "7.1.1", - "from": "glob@>=7.0.5 <8.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "from": "fs.realpath@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" - }, - "inflight": { - "version": "1.0.6", - "from": "inflight@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" - } - } - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" - }, - "minimatch": { - "version": "3.0.3", - "from": "minimatch@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "dependencies": { - "brace-expansion": { - "version": "1.1.7", - "from": "brace-expansion@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" - } - } - } - } - }, - "once": { - "version": "1.4.0", - "from": "once@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "from": "path-is-absolute@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" - } - } - } - } - } - } - } - } - }, - "ioredis": { - "version": "2.5.0", - "from": "ioredis@>=2.5.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-2.5.0.tgz", - "dependencies": { - "bluebird": { - "version": "3.5.0", - "from": "bluebird@>=3.3.4 <4.0.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz" - }, - "cluster-key-slot": { - "version": "1.0.8", - "from": "cluster-key-slot@>=1.0.6 <2.0.0", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz" - }, - "debug": { - "version": "2.6.6", - "from": "debug@>=2.2.0 <3.0.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz", - "dependencies": { - "ms": { - "version": "0.7.3", - "from": "ms@0.7.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz" - } - } - }, - "double-ended-queue": { - "version": "2.1.0-0", - "from": "double-ended-queue@>=2.1.0-0 <3.0.0", - "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz" - }, - "flexbuffer": { - "version": "0.0.6", - "from": "flexbuffer@0.0.6", - "resolved": "https://registry.npmjs.org/flexbuffer/-/flexbuffer-0.0.6.tgz" - }, - "lodash": { - "version": "4.17.4", - "from": "lodash@>=4.8.2 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" - }, - "redis-commands": { - "version": "1.3.1", - "from": "redis-commands@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz" - }, - "redis-parser": { - "version": "1.3.0", - "from": "redis-parser@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-1.3.0.tgz" - } - } - }, - "mocha": { - "version": "1.21.4", - "from": "mocha@1.21.4", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz", - "dependencies": { - "commander": { - "version": "2.0.0", - "from": "commander@2.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz" - }, - "growl": { - "version": "1.8.1", - "from": "growl@>=1.8.0 <1.9.0", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz" - }, - "jade": { - "version": "0.26.3", - "from": "jade@0.26.3", - "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", - "dependencies": { - "commander": { - "version": "0.6.1", - "from": "commander@0.6.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz" - }, - "mkdirp": { - "version": "0.3.0", - "from": "mkdirp@0.3.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" - } - } - }, - "diff": { - "version": "1.0.7", - "from": "diff@1.0.7", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz" - }, - "debug": { - "version": "2.6.6", - "from": "debug@*", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz", - "dependencies": { - "ms": { - "version": "0.7.3", - "from": "ms@0.7.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz" - } - } - }, - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@0.3.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" - }, - "glob": { - "version": "3.2.3", - "from": "glob@3.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", - "dependencies": { - "minimatch": { - "version": "0.2.14", - "from": "minimatch@>=0.2.11 <0.3.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "dependencies": { - "lru-cache": { - "version": "2.7.3", - "from": "lru-cache@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" - }, - "sigmund": { - "version": "1.0.1", - "from": "sigmund@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" - } - } - }, - "graceful-fs": { - "version": "2.0.3", - "from": "graceful-fs@>=2.0.0 <2.1.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" - } - } - } - } - }, - "redis": { - "version": "0.12.1", - "from": "redis@0.12.1", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz" - }, - "redis-sentinel": { - "version": "0.1.1", - "from": "redis-sentinel@0.1.1", - "resolved": "https://registry.npmjs.org/redis-sentinel/-/redis-sentinel-0.1.1.tgz", - "dependencies": { - "redis": { - "version": "0.11.0", - "from": "redis@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/redis/-/redis-0.11.0.tgz" - }, - "q": { - "version": "0.9.2", - "from": "q@0.9.2", - "resolved": "https://registry.npmjs.org/q/-/q-0.9.2.tgz" - } - } - }, - "sandboxed-module": { - "version": "1.0.1", - "from": "sandboxed-module@1.0.1", - "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-1.0.1.tgz", - "dependencies": { - "require-like": { - "version": "0.1.2", - "from": "require-like@0.1.2", - "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz" - }, - "stack-trace": { - "version": "0.0.9", - "from": "stack-trace@0.0.9", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz" - } - } - }, - "sinon": { - "version": "1.10.3", - "from": "sinon@1.10.3", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz", - "dependencies": { - "formatio": { - "version": "1.0.2", - "from": "formatio@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz", - "dependencies": { - "samsam": { - "version": "1.1.3", - "from": "samsam@>=1.1.0 <1.2.0", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz" - } - } - }, - "util": { - "version": "0.10.3", - "from": "util@>=0.10.3 <1.0.0", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "dependencies": { - "inherits": { - "version": "2.0.1", - "from": "inherits@2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - } - } - } - } - }, - "redis": { - "version": "0.10.3", - "from": "redis@~0.10.1" - }, - "underscore": { - "version": "1.7.0", - "from": "underscore@~1.7.0" - }, - "mongo-uri": { - "version": "0.1.2", - "from": "mongo-uri@^0.1.2" - }, - "s3-streams": { - "version": "0.3.0", - "from": "s3-streams@^0.3.0", - "dependencies": { - "lodash": { - "version": "3.10.1", - "from": "lodash@^3.9.3" - }, - "readable-stream": { - "version": "2.2.6", - "from": "readable-stream@^2.0.0", - "dependencies": { - "buffer-shims": { - "version": "1.0.0", - "from": "buffer-shims@^1.0.0" - }, - "core-util-is": { - "version": "1.0.2", - "from": "core-util-is@~1.0.0" - }, - "isarray": { - "version": "1.0.0", - "from": "isarray@~1.0.0" - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@~2.0.1" - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "process-nextick-args@~1.0.6" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@~0.10.x" - }, - "util-deprecate": { - "version": "1.0.2", - "from": "util-deprecate@~1.0.1" - } - } - }, - "bluebird": { - "version": "2.11.0", - "from": "bluebird@^2.9.27" - } - } - }, - "JSONStream": { - "version": "1.3.1", - "from": "JSONStream@^1.0.4", - "dependencies": { - "jsonparse": { - "version": "1.3.0", - "from": "jsonparse@^1.2.0" - }, - "through": { - "version": "2.3.8", - "from": "through@>=2.2.7 <3" - } - } - }, - "heap": { - "version": "0.2.6", - "from": "heap@^0.2.6" - }, - "v8-profiler": { - "version": "5.7.0", - "from": "v8-profiler@^5.6.5", - "dependencies": { - "nan": { - "version": "2.5.1", - "from": "nan@^2.5.1" - }, - "node-pre-gyp": { - "version": "0.6.34", - "from": "node-pre-gyp@^0.6.34", - "dependencies": { - "mkdirp": { - "version": "0.5.1", - "from": "mkdirp@^0.5.1", - "dependencies": { - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8" - } - } - }, - "nopt": { - "version": "4.0.1", - "from": "nopt@^4.0.1", - "dependencies": { - "abbrev": { - "version": "1.1.0", - "from": "abbrev@1" - }, - "osenv": { - "version": "0.1.4", - "from": "osenv@^0.1.4", - "dependencies": { - "os-homedir": { - "version": "1.0.2", - "from": "os-homedir@^1.0.0" - }, - "os-tmpdir": { - "version": "1.0.2", - "from": "os-tmpdir@^1.0.0" - } - } - } - } - }, - "npmlog": { - "version": "4.0.2", - "from": "npmlog@^4.0.2", - "dependencies": { - "are-we-there-yet": { - "version": "1.1.2", - "from": "are-we-there-yet@~1.1.2", - "dependencies": { - "delegates": { - "version": "1.0.0", - "from": "delegates@^1.0.0" - }, - "readable-stream": { - "version": "2.2.6", - "from": "readable-stream@^2.0.0 || ^1.1.13", - "dependencies": { - "buffer-shims": { - "version": "1.0.0", - "from": "buffer-shims@^1.0.0" - }, - "core-util-is": { - "version": "1.0.2", - "from": "core-util-is@~1.0.0" - }, - "isarray": { - "version": "1.0.0", - "from": "isarray@~1.0.0" - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@~2.0.1" - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "process-nextick-args@~1.0.6" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@~0.10.x" - }, - "util-deprecate": { - "version": "1.0.2", - "from": "util-deprecate@~1.0.1" - } - } - } - } - }, - "console-control-strings": { - "version": "1.1.0", - "from": "console-control-strings@~1.1.0" - }, - "gauge": { - "version": "2.7.3", - "from": "gauge@~2.7.1", - "dependencies": { - "aproba": { - "version": "1.1.1", - "from": "aproba@^1.0.3" - }, - "has-unicode": { - "version": "2.0.1", - "from": "has-unicode@^2.0.0" - }, - "object-assign": { - "version": "4.1.1", - "from": "object-assign@^4.1.0" - }, - "signal-exit": { - "version": "3.0.2", - "from": "signal-exit@^3.0.0" - }, - "string-width": { - "version": "1.0.2", - "from": "string-width@^1.0.1", - "dependencies": { - "code-point-at": { - "version": "1.1.0", - "from": "code-point-at@^1.0.0" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "from": "is-fullwidth-code-point@^1.0.0", - "dependencies": { - "number-is-nan": { - "version": "1.0.1", - "from": "number-is-nan@^1.0.0" - } - } - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "from": "strip-ansi@^3.0.1", - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "from": "ansi-regex@^2.0.0" - } - } - }, - "wide-align": { - "version": "1.1.0", - "from": "wide-align@^1.1.0" - } - } - }, - "set-blocking": { - "version": "2.0.0", - "from": "set-blocking@~2.0.0" - } - } - }, - "rc": { - "version": "1.2.1", - "from": "rc@^1.1.7", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", - "dependencies": { - "deep-extend": { - "version": "0.4.1", - "from": "deep-extend@~0.4.0" - }, - "ini": { - "version": "1.3.4", - "from": "ini@~1.3.0" - }, - "minimist": { - "version": "1.2.0", - "from": "minimist@^1.2.0" - }, - "strip-json-comments": { - "version": "2.0.1", - "from": "strip-json-comments@~2.0.1" - } - } - }, - "request": { - "version": "2.81.0", - "from": "request@^2.81.0", - "dependencies": { - "aws-sign2": { - "version": "0.6.0", - "from": "aws-sign2@~0.6.0" - }, - "aws4": { - "version": "1.6.0", - "from": "aws4@^1.2.1" - }, - "caseless": { - "version": "0.12.0", - "from": "caseless@~0.12.0" - }, - "combined-stream": { - "version": "1.0.5", - "from": "combined-stream@~1.0.5", - "dependencies": { - "delayed-stream": { - "version": "1.0.0", - "from": "delayed-stream@~1.0.0" - } - } - }, - "extend": { - "version": "3.0.0", - "from": "extend@~3.0.0" - }, - "forever-agent": { - "version": "0.6.1", - "from": "forever-agent@~0.6.1" - }, - "form-data": { - "version": "2.1.2", - "from": "form-data@~2.1.1", - "dependencies": { - "asynckit": { - "version": "0.4.0", - "from": "asynckit@^0.4.0" - } - } - }, - "har-validator": { - "version": "4.2.1", - "from": "har-validator@~4.2.1", - "dependencies": { - "ajv": { - "version": "4.11.5", - "from": "ajv@^4.9.1", - "dependencies": { - "co": { - "version": "4.6.0", - "from": "co@^4.6.0" - }, - "json-stable-stringify": { - "version": "1.0.1", - "from": "json-stable-stringify@^1.0.1", - "dependencies": { - "jsonify": { - "version": "0.0.0", - "from": "jsonify@~0.0.0" - } - } - } - } - }, - "har-schema": { - "version": "1.0.5", - "from": "har-schema@^1.0.5" - } - } - }, - "hawk": { - "version": "3.1.3", - "from": "hawk@~3.1.3", - "dependencies": { - "hoek": { - "version": "2.16.3", - "from": "hoek@2.x.x" - }, - "boom": { - "version": "2.10.1", - "from": "boom@2.x.x" - }, - "cryptiles": { - "version": "2.0.5", - "from": "cryptiles@2.x.x" - }, - "sntp": { - "version": "1.0.9", - "from": "sntp@1.x.x" - } - } - }, - "http-signature": { - "version": "1.1.1", - "from": "http-signature@~1.1.0", - "dependencies": { - "assert-plus": { - "version": "0.2.0", - "from": "assert-plus@^0.2.0" - }, - "jsprim": { - "version": "1.4.0", - "from": "jsprim@^1.2.2", - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "from": "assert-plus@1.0.0" - }, - "extsprintf": { - "version": "1.0.2", - "from": "extsprintf@1.0.2" - }, - "json-schema": { - "version": "0.2.3", - "from": "json-schema@0.2.3" - }, - "verror": { - "version": "1.3.6", - "from": "verror@1.3.6" - } - } - }, - "sshpk": { - "version": "1.11.0", - "from": "sshpk@^1.7.0", - "dependencies": { - "asn1": { - "version": "0.2.3", - "from": "asn1@~0.2.3" - }, - "assert-plus": { - "version": "1.0.0", - "from": "assert-plus@^1.0.0" - }, - "dashdash": { - "version": "1.14.1", - "from": "dashdash@^1.12.0" - }, - "getpass": { - "version": "0.1.6", - "from": "getpass@^0.1.1" - }, - "jsbn": { - "version": "0.1.1", - "from": "jsbn@~0.1.0" - }, - "tweetnacl": { - "version": "0.14.5", - "from": "tweetnacl@~0.14.0" - }, - "jodid25519": { - "version": "1.0.2", - "from": "jodid25519@^1.0.0" - }, - "ecc-jsbn": { - "version": "0.1.1", - "from": "ecc-jsbn@~0.1.1" - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "from": "bcrypt-pbkdf@^1.0.0" - } - } - } - } - }, - "is-typedarray": { - "version": "1.0.0", - "from": "is-typedarray@~1.0.0" - }, - "isstream": { - "version": "0.1.2", - "from": "isstream@~0.1.2" - }, - "json-stringify-safe": { - "version": "5.0.1", - "from": "json-stringify-safe@~5.0.1" - }, - "mime-types": { - "version": "2.1.15", - "from": "mime-types@~2.1.7", - "dependencies": { - "mime-db": { - "version": "1.27.0", - "from": "mime-db@~1.27.0" - } - } - }, - "oauth-sign": { - "version": "0.8.2", - "from": "oauth-sign@~0.8.1" - }, - "performance-now": { - "version": "0.2.0", - "from": "performance-now@^0.2.0" - }, - "qs": { - "version": "6.4.0", - "from": "qs@~6.4.0" - }, - "safe-buffer": { - "version": "5.0.1", - "from": "safe-buffer@^5.0.1" - }, - "stringstream": { - "version": "0.0.5", - "from": "stringstream@~0.0.4" - }, - "tough-cookie": { - "version": "2.3.2", - "from": "tough-cookie@~2.3.0", - "dependencies": { - "punycode": { - "version": "1.4.1", - "from": "punycode@^1.4.1" - } - } - }, - "tunnel-agent": { - "version": "0.6.0", - "from": "tunnel-agent@^0.6.0" - }, - "uuid": { - "version": "3.0.1", - "from": "uuid@^3.0.0" - } - } - }, - "rimraf": { - "version": "2.6.1", - "from": "rimraf@^2.6.1", - "dependencies": { - "glob": { - "version": "7.1.1", - "from": "glob@^7.0.5", - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "from": "fs.realpath@^1.0.0" - }, - "inflight": { - "version": "1.0.6", - "from": "inflight@^1.0.4", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@2" - }, - "minimatch": { - "version": "3.0.3", - "from": "minimatch@^3.0.2", - "dependencies": { - "brace-expansion": { - "version": "1.1.6", - "from": "brace-expansion@^1.0.0", - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@^0.4.1" - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1" - } - } - } - } - }, - "once": { - "version": "1.4.0", - "from": "once@^1.3.0", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "from": "path-is-absolute@^1.0.0" - } - } - } - } - }, - "semver": { - "version": "5.3.0", - "from": "semver@^5.3.0" - }, - "tar": { - "version": "2.2.1", - "from": "tar@^2.2.1", - "dependencies": { - "block-stream": { - "version": "0.0.9", - "from": "block-stream@*" - }, - "fstream": { - "version": "1.0.11", - "from": "fstream@^1.0.2", - "dependencies": { - "graceful-fs": { - "version": "4.1.11", - "from": "graceful-fs@^4.1.2" - } - } - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@2" - } - } - }, - "tar-pack": { - "version": "3.4.0", - "from": "tar-pack@^3.4.0", - "dependencies": { - "debug": { - "version": "2.6.3", - "from": "debug@^2.2.0", - "dependencies": { - "ms": { - "version": "0.7.2", - "from": "ms@0.7.2" - } - } - }, - "fstream": { - "version": "1.0.11", - "from": "fstream@^1.0.10", - "dependencies": { - "graceful-fs": { - "version": "4.1.11", - "from": "graceful-fs@^4.1.2" - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@2" - } - } - }, - "fstream-ignore": { - "version": "1.0.5", - "from": "fstream-ignore@^1.0.5", - "dependencies": { - "inherits": { - "version": "2.0.3", - "from": "inherits@2" - }, - "minimatch": { - "version": "3.0.3", - "from": "minimatch@^3.0.0", - "dependencies": { - "brace-expansion": { - "version": "1.1.6", - "from": "brace-expansion@^1.0.0", - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "balanced-match@^0.4.1" - }, - "concat-map": { - "version": "0.0.1", - "from": "concat-map@0.0.1" - } - } - } - } - } - } - }, - "once": { - "version": "1.4.0", - "from": "once@^1.3.3", - "dependencies": { - "wrappy": { - "version": "1.0.2", - "from": "wrappy@1" - } - } - }, - "readable-stream": { - "version": "2.2.6", - "from": "readable-stream@^2.1.4", - "dependencies": { - "buffer-shims": { - "version": "1.0.0", - "from": "buffer-shims@^1.0.0" - }, - "core-util-is": { - "version": "1.0.2", - "from": "core-util-is@~1.0.0" - }, - "isarray": { - "version": "1.0.0", - "from": "isarray@~1.0.0" - }, - "inherits": { - "version": "2.0.3", - "from": "inherits@~2.0.1" - }, - "process-nextick-args": { - "version": "1.0.7", - "from": "process-nextick-args@~1.0.6" - }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@~0.10.x" - }, - "util-deprecate": { - "version": "1.0.2", - "from": "util-deprecate@~1.0.1" - } - } - }, - "uid-number": { - "version": "0.0.6", - "from": "uid-number@^0.0.6" - } - } - } - } - } - } - }, - "aws-sdk": { - "version": "2.37.0", - "from": "aws-sdk@^2.1.34", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.37.0.tgz", - "dependencies": { - "buffer": { - "version": "4.9.1", - "from": "buffer@4.9.1", - "dependencies": { - "base64-js": { - "version": "1.2.0", - "from": "base64-js@^1.0.2" - }, - "ieee754": { - "version": "1.1.8", - "from": "ieee754@^1.1.4" - }, - "isarray": { - "version": "1.0.0", - "from": "isarray@^1.0.0" - } - } - }, - "crypto-browserify": { - "version": "1.0.9", - "from": "crypto-browserify@1.0.9" - }, - "jmespath": { - "version": "0.15.0", - "from": "jmespath@0.15.0" - }, - "querystring": { - "version": "0.2.0", - "from": "querystring@0.2.0" - }, - "sax": { - "version": "1.1.5", - "from": "sax@1.1.5" - }, - "url": { - "version": "0.10.3", - "from": "url@0.10.3", - "dependencies": { - "punycode": { - "version": "1.3.2", - "from": "punycode@1.3.2" - } - } - }, - "uuid": { - "version": "3.0.0", - "from": "uuid@3.0.0" - }, - "xml2js": { - "version": "0.4.15", - "from": "xml2js@0.4.15" - }, - "xmlbuilder": { - "version": "2.6.2", - "from": "xmlbuilder@2.6.2", - "dependencies": { - "lodash": { - "version": "3.5.0", - "from": "lodash@~3.5.0" - } - } - } - } - } - } -} diff --git a/services/track-changes/package.json b/services/track-changes/package.json index a2656c3840..31f6b2a0ea 100644 --- a/services/track-changes/package.json +++ b/services/track-changes/package.json @@ -3,34 +3,35 @@ "version": "0.1.4", "description": "An API for saving and compressing individual document updates into a browsable history", "repository": { - "type": "git", + "type": "git", "url": "https://github.com/sharelatex/track-changes-sharelatex.git" }, "dependencies": { + "JSONStream": "^1.0.4", "async": "~0.2.10", + "aws-sdk": "^2.102.0", "bson": "^0.4.20", "byline": "^4.2.1", "cli": "^0.6.6", "express": "3.3.5", + "heap": "^0.2.6", "line-reader": "^0.2.4", - "mongojs": "^1.4.1", - "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6", "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.7.1", + "mongo-uri": "^0.1.2", + "mongojs": "2.4.0", + "redis": "~0.10.1", + "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.2", "request": "~2.33.0", "requestretry": "^1.12.0", - "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.2", - "redis": "~0.10.1", - "underscore": "~1.7.0", - "mongo-uri": "^0.1.2", "s3-streams": "^0.3.0", - "JSONStream": "^1.0.4", - "heap": "^0.2.6", + "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", + "underscore": "~1.7.0", "v8-profiler": "^5.6.5" }, "devDependencies": { - "chai": "~1.9.0", - "sinon": "~1.8.2", + "chai": "~4.1.1", + "sinon": "~3.2.1", "sandboxed-module": "~0.3.0", "grunt-execute": "~0.1.5", "grunt-contrib-clean": "~0.5.0", @@ -38,7 +39,7 @@ "grunt": "~0.4.2", "grunt-available-tasks": "~0.4.2", "grunt-contrib-coffee": "~0.10.1", - "bunyan": "~0.22.1", + "bunyan": "~2.0.2", "grunt-bunyan": "~0.5.0", "grunt-forever": "~0.4.2", "timekeeper": "0.0.4", diff --git a/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee b/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee index 2dc289d89a..8c23b82f72 100644 --- a/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee +++ b/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee @@ -30,7 +30,7 @@ describe "MongoAWS", -> @project_id = ObjectId().toString() @doc_id = ObjectId().toString() - @pack_id = ObjectId() + @pack_id = ObjectId().toString() @update = { v:123 } @callback = sinon.stub() diff --git a/services/track-changes/test/unit/coffee/DocumentUpdaterManager/DocumentUpdaterManagerTests.coffee b/services/track-changes/test/unit/coffee/DocumentUpdaterManager/DocumentUpdaterManagerTests.coffee index 2329cf79f5..3339a4242d 100644 --- a/services/track-changes/test/unit/coffee/DocumentUpdaterManager/DocumentUpdaterManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/DocumentUpdaterManager/DocumentUpdaterManagerTests.coffee @@ -31,7 +31,7 @@ describe "DocumentUpdaterManager", -> @request.get.calledWith(url).should.equal true it "should call the callback with the content and version", -> - @callback.calledWith(null, @lines.join("\n"), @version, @ops).should.equal true + @callback.calledWith(null, @lines.join("\n"), @version).should.equal true describe "when the document updater API returns an error", -> beforeEach -> @@ -48,7 +48,7 @@ describe "DocumentUpdaterManager", -> it "should return the callback with an error", -> @callback - .calledWith(new Error("doc updater returned failure status code: 500")) + .calledWith(sinon.match.has('message', "doc updater returned a non-success status code: 500")) .should.equal true describe "setDocument", -> @@ -91,5 +91,5 @@ describe "DocumentUpdaterManager", -> it "should return the callback with an error", -> @callback - .calledWith(new Error("doc updater returned failure status code: 500")) - .should.equal true \ No newline at end of file + .calledWith(sinon.match.has('message', "doc updater returned a non-success status code: 500")) + .should.equal true diff --git a/services/track-changes/test/unit/coffee/LockManager/LockManagerTests.coffee b/services/track-changes/test/unit/coffee/LockManager/LockManagerTests.coffee index ad4df198a9..ed30cb2815 100644 --- a/services/track-changes/test/unit/coffee/LockManager/LockManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/LockManager/LockManagerTests.coffee @@ -194,5 +194,5 @@ describe "LockManager", -> @LockManager.releaseLock @key, @lockValue, @callback it 'should return an error if the lock has expired', -> - @callback.calledWith(new Error("tried to release timed out lock")).should.equal true + @callback.calledWith(sinon.match.has('message', "tried to release timed out lock")).should.equal true diff --git a/services/track-changes/test/unit/coffee/PackManager/PackManagerTests.coffee b/services/track-changes/test/unit/coffee/PackManager/PackManagerTests.coffee index 283e288315..f6243619d2 100644 --- a/services/track-changes/test/unit/coffee/PackManager/PackManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/PackManager/PackManagerTests.coffee @@ -316,7 +316,7 @@ describe "PackManager", -> it "should call the callback", -> @callback.called.should.equal true it "should return an error", -> - @callback.calledWith(new Error()).should.equal true + @callback.calledWith(sinon.match.has('message')).should.equal true describe "when an archive is completed", -> beforeEach -> @@ -326,17 +326,17 @@ describe "PackManager", -> it "should call the callback", -> @callback.called.should.equal true it "should return an error", -> - @callback.calledWith(new Error()).should.equal true + @callback.calledWith(sinon.match.has('message')).should.equal true describe "when the archive has not started or completed", -> beforeEach -> @db.docHistoryIndex = findOne: sinon.stub().callsArgWith(2, null, {}) @PackManager.checkArchiveNotInProgress @project_id, @doc_id, @pack_id, @callback - it "should call the callback", -> + it "should call the callback with no error", -> @callback.called.should.equal true it "should return with no error", -> - @callback.calledWith(undefined).should.equal true + (typeof @callback.lastCall.args[0]).should.equal 'undefined' # describe "setTTLOnArchivedPack", -> # beforeEach -> diff --git a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee index 88f1c7998a..1943116341 100644 --- a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee @@ -97,6 +97,7 @@ describe "UpdatesManager", -> @lastCompressedUpdate = {pack: [{ v: 11, op: "compressed-op-11" }], v:11} @rawUpdates = [{ v: 12, op: "mock-op-12" }, { v: 13, op: "mock-op-13" }] @MongoManager.peekLastCompressedUpdate = sinon.stub().callsArgWith(1, null, @lastCompressedUpdate, @lastCompressedUpdate.v) + # @UpdateCompressor.compressRawUpdates = sinon.stub().returns(@compressedUpdates) @UpdatesManager.compressAndSaveRawUpdates @project_id, @doc_id, @rawUpdates, @temporary, @callback it "should look at the last compressed op", -> @@ -104,9 +105,12 @@ describe "UpdatesManager", -> .calledWith(@doc_id) .should.equal true - it "should defer the compression of raw ops until they are written in a new pack", -> - @UpdateCompressor.compressRawUpdates - .should.not.be.called + # FIXME: Broken test, was hidden by an api mistake + + # it "should defer the compression of raw ops until they are written in a new pack", -> + # console.log @UpdateCompressor.compressRawUpdates.called + # @UpdateCompressor.compressRawUpdates + # .called.should.not.equal true it "should save the new compressed ops into a pack", -> @PackManager.insertCompressedUpdates @@ -134,7 +138,7 @@ describe "UpdatesManager", -> it "should call the callback with an error", -> @callback - .calledWith(new Error("Tried to apply raw op at version 13 to last compressed update with version 11")) + .calledWith(sinon.match.has('message', "Tried to apply raw op at version 13 to last compressed update with version 11 from unknown time")) .should.equal true it "should not insert any update into mongo", -> @@ -147,7 +151,7 @@ describe "UpdatesManager", -> it "should call the callback with an error", -> @callback - .calledWith(new Error) + .calledWith(sinon.match.has('message')) .should.equal true it "should not insert any update into mongo", -> diff --git a/services/track-changes/test/unit/coffee/WebApiManager/WebApiManagerTests.coffee b/services/track-changes/test/unit/coffee/WebApiManager/WebApiManagerTests.coffee index fe33d08a4a..92c0fcd54a 100644 --- a/services/track-changes/test/unit/coffee/WebApiManager/WebApiManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/WebApiManager/WebApiManagerTests.coffee @@ -64,12 +64,12 @@ describe "WebApiManager", -> describe "when the web returns a failure error code", -> beforeEach -> - @request.get = sinon.stub().callsArgWith(1, null, { statusCode: 500 }, "") + @request.get = sinon.stub().callsArgWith(1, null, { statusCode: 500, attempts: 42}, "") @WebApiManager.getUserInfo @user_id, @callback it "should return the callback with an error", -> @callback - .calledWith(new Error("web returned failure status code: 500")) + .calledWith(sinon.match.has('message', "web returned a non-success status code: 500 (attempts: 42)")) .should.equal true describe "when the user cannot be found", -> @@ -114,10 +114,10 @@ describe "WebApiManager", -> describe "when the web returns a failure error code", -> beforeEach -> - @request.get = sinon.stub().callsArgWith(1, null, { statusCode: 500 }, "") + @request.get = sinon.stub().callsArgWith(1, null, { statusCode: 500, attempts: 42 }, "") @WebApiManager.getProjectDetails @project_id, @callback it "should return the callback with an error", -> @callback - .calledWith(new Error("web returned failure status code: 500")) + .calledWith(sinon.match.has('message', "web returned a non-success status code: 500 (attempts: 42)")) .should.equal true From 7c9ca7ccef0fb999111c6c9168315a3bc3a63b05 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 25 Aug 2017 14:46:47 +0100 Subject: [PATCH 2/6] Revert accidental change --- .../track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee b/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee index 8c23b82f72..2dc289d89a 100644 --- a/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee +++ b/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee @@ -30,7 +30,7 @@ describe "MongoAWS", -> @project_id = ObjectId().toString() @doc_id = ObjectId().toString() - @pack_id = ObjectId().toString() + @pack_id = ObjectId() @update = { v:123 } @callback = sinon.stub() From cd2ed249379b501e1cbc45759a48aec6eecf1927 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 25 Aug 2017 14:47:07 +0100 Subject: [PATCH 3/6] Fix WriteStream API --- .../track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee b/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee index 2dc289d89a..3424418935 100644 --- a/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee +++ b/services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee @@ -39,7 +39,8 @@ describe "MongoAWS", -> beforeEach (done) -> @awssdk.config = { update: sinon.stub() } @awssdk.S3 = sinon.stub() - @S3S.WriteStream = MemoryStream.createWriteStream + @S3S.WriteStream = () -> + MemoryStream.createWriteStream() @db.docHistory = {} @db.docHistory.findOne = sinon.stub().callsArgWith(1, null, {"pack":"hello"}) From f6fdc5a8270872d0b73f59f6dbec386e3a529bad Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 25 Aug 2017 14:50:33 +0100 Subject: [PATCH 4/6] Remove stray log --- services/track-changes/app/coffee/WebApiManager.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/services/track-changes/app/coffee/WebApiManager.coffee b/services/track-changes/app/coffee/WebApiManager.coffee index a95808deee..aee8d431dd 100644 --- a/services/track-changes/app/coffee/WebApiManager.coffee +++ b/services/track-changes/app/coffee/WebApiManager.coffee @@ -30,7 +30,6 @@ module.exports = WebApiManager = return callback null, body else error = new Error("web returned a non-success status code: #{res.statusCode} (attempts: #{res.attempts})") - console.log error.message callback error getUserInfo: (user_id, callback = (error, userInfo) ->) -> From ad43ddb6c610b5aea2f1b06a164334e9509a41c4 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 25 Aug 2017 14:52:14 +0100 Subject: [PATCH 5/6] Remove commented-out code --- .../test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee index 1943116341..c669bb1c68 100644 --- a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee @@ -97,7 +97,6 @@ describe "UpdatesManager", -> @lastCompressedUpdate = {pack: [{ v: 11, op: "compressed-op-11" }], v:11} @rawUpdates = [{ v: 12, op: "mock-op-12" }, { v: 13, op: "mock-op-13" }] @MongoManager.peekLastCompressedUpdate = sinon.stub().callsArgWith(1, null, @lastCompressedUpdate, @lastCompressedUpdate.v) - # @UpdateCompressor.compressRawUpdates = sinon.stub().returns(@compressedUpdates) @UpdatesManager.compressAndSaveRawUpdates @project_id, @doc_id, @rawUpdates, @temporary, @callback it "should look at the last compressed op", -> From 1cd80b9dcde52259ee0ccea7bbedac40645cd931 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 25 Aug 2017 14:53:39 +0100 Subject: [PATCH 6/6] Restore a broken test that was commented out temporarily --- .../coffee/UpdatesManager/UpdatesManagerTests.coffee | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee index c669bb1c68..dec00765c7 100644 --- a/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee +++ b/services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee @@ -105,11 +105,10 @@ describe "UpdatesManager", -> .should.equal true # FIXME: Broken test, was hidden by an api mistake - - # it "should defer the compression of raw ops until they are written in a new pack", -> - # console.log @UpdateCompressor.compressRawUpdates.called - # @UpdateCompressor.compressRawUpdates - # .called.should.not.equal true + it "should defer the compression of raw ops until they are written in a new pack", -> + console.log @UpdateCompressor.compressRawUpdates.called + @UpdateCompressor.compressRawUpdates + .called.should.not.equal true it "should save the new compressed ops into a pack", -> @PackManager.insertCompressedUpdates