From 525c15124a50548ac51b389c854c3b6a1e2e5ca1 Mon Sep 17 00:00:00 2001 From: Abhinav Adduri Date: Fri, 23 Jun 2017 11:42:51 -0700 Subject: [PATCH] cleaned --- package-lock.json | 14 +++++++++++++- server/config.js | 2 +- server/storage.js | 6 +++++- test/local.storage.test.js | 8 ++++++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ba38c09b..3ab4be91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2464,6 +2464,12 @@ "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", "dev": true }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, "is-windows": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz", @@ -2875,7 +2881,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=" + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" }, "minimist": { "version": "0.0.10", @@ -4329,6 +4335,12 @@ } } }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "optional": true + }, "umd": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz", diff --git a/server/config.js b/server/config.js index 6dd487a9..c49681b8 100644 --- a/server/config.js +++ b/server/config.js @@ -44,7 +44,7 @@ conf.validate({ allowed: 'strict' }); const props = conf.getProperties(); module.exports = props; -console.log(props.sentry_dsn) + module.exports.notLocalHost = props.env === 'production' && props.s3_bucket !== 'localhost' && diff --git a/server/storage.js b/server/storage.js index a29d0052..63b1bbdc 100644 --- a/server/storage.js +++ b/server/storage.js @@ -58,7 +58,11 @@ function filename(id) { function exists(id) { return new Promise((resolve, reject) => { redis_client.exists(id, (rediserr, reply) => { - reply === 1 && !rediserr ? resolve() : reject(rediserr);; + if (reply === 1 && !rediserr) { + resolve(); + } else { + reject(rediserr); + } }); }); } diff --git a/test/local.storage.test.js b/test/local.storage.test.js index bb8ad187..d7d33f1b 100644 --- a/test/local.storage.test.js +++ b/test/local.storage.test.js @@ -44,12 +44,16 @@ const storage = proxyquire('../server/storage', { describe('Testing Exists from local filesystem', function() { it('Exists returns true when file exists', function() { exists.callsArgWith(1, null, 1); - return storage.exists('test').then(reply => assert(reply)); + return storage.exists('test') + .then(() => assert(1)) + .catch(err => assert.fail()) }); it('Exists returns false when file does not exist', function() { exists.callsArgWith(1, null, 0); - return storage.exists('test').then(reply => assert(!reply)); + return storage.exists('test') + .then(() => assert.fail()) + .catch(err => assert(1)) }); });