IGNITE-3262 Fixed ESLint warnings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ffdf3d9e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ffdf3d9e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ffdf3d9e Branch: refs/heads/ignite-3262 Commit: ffdf3d9e16a11e2488d2e87ebcd843c672a81142 Parents: ae61ebe Author: Maxim Afanasiev <[email protected]> Authored: Thu Jun 30 10:29:38 2016 +0700 Committer: Maxim Afanasiev <[email protected]> Committed: Thu Jun 30 10:29:38 2016 +0700 ---------------------------------------------------------------------- .../web-console/src/main/js/serve/configure.js | 2 +- modules/web-console/src/main/js/serve/index.js | 10 ++-- .../web-console/src/main/js/serve/injector.js | 2 +- .../web-console/src/main/js/serve/settings.js | 2 +- .../src/main/js/test/backend/injector.js | 2 +- .../js/test/backend/unit/CacheService.test.js | 53 ++++++++++++-------- 6 files changed, 41 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ffdf3d9e/modules/web-console/src/main/js/serve/configure.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/serve/configure.js b/modules/web-console/src/main/js/serve/configure.js index d90c27d..474e2f0 100644 --- a/modules/web-console/src/main/js/serve/configure.js +++ b/modules/web-console/src/main/js/serve/configure.js @@ -38,7 +38,7 @@ module.exports.factory = function(logger, cookieParser, bodyParser, session, con })); app.use(api); - + app.use(cookieParser(settings.sessionSecret)); app.use(bodyParser.json({limit: '50mb'})); http://git-wip-us.apache.org/repos/asf/ignite/blob/ffdf3d9e/modules/web-console/src/main/js/serve/index.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/serve/index.js b/modules/web-console/src/main/js/serve/index.js index ff59ec2..f2bfc4a 100644 --- a/modules/web-console/src/main/js/serve/index.js +++ b/modules/web-console/src/main/js/serve/index.js @@ -17,9 +17,9 @@ 'use strict'; -const http = require('http'), - https = require('https'), - fireUp = require('./injector'); +import http from 'http'; +import https from 'https'; +import fireUp from './injector'; /** * Event listener for HTTP server "error" event. @@ -28,7 +28,7 @@ const _onError = (port, error) => { if (error.syscall !== 'listen') throw error; - var bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port; + const bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port; // Handle specific listen errors with friendly messages. switch (error.code) { @@ -51,7 +51,7 @@ const _onError = (port, error) => { * Event listener for HTTP server "listening" event. */ const _onListening = (addr) => { - var bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port; + const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port; console.log('Start listening on ' + bind); }; http://git-wip-us.apache.org/repos/asf/ignite/blob/ffdf3d9e/modules/web-console/src/main/js/serve/injector.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/serve/injector.js b/modules/web-console/src/main/js/serve/injector.js index 650d26b..64c751e 100644 --- a/modules/web-console/src/main/js/serve/injector.js +++ b/modules/web-console/src/main/js/serve/injector.js @@ -27,4 +27,4 @@ const fireUp = require('fire-up').newInjector({ ] }); -module.exports = fireUp; \ No newline at end of file +module.exports = fireUp; http://git-wip-us.apache.org/repos/asf/ignite/blob/ffdf3d9e/modules/web-console/src/main/js/serve/settings.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/serve/settings.js b/modules/web-console/src/main/js/serve/settings.js index 8973e5d..fe11fd4 100644 --- a/modules/web-console/src/main/js/serve/settings.js +++ b/modules/web-console/src/main/js/serve/settings.js @@ -30,7 +30,7 @@ module.exports = { module.exports.factory = function(nconf, fs) { nconf.file({file: './serve/config/settings.json'}); - if(process.env.CONFIG_PATH && fs.existsSync(process.env.CONFIG_PATH)) + if (process.env.CONFIG_PATH && fs.existsSync(process.env.CONFIG_PATH)) nconf.file({file: process.env.CONFIG_PATH}); /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ffdf3d9e/modules/web-console/src/main/js/test/backend/injector.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/test/backend/injector.js b/modules/web-console/src/main/js/test/backend/injector.js index 90d6d43..01991e4 100644 --- a/modules/web-console/src/main/js/test/backend/injector.js +++ b/modules/web-console/src/main/js/test/backend/injector.js @@ -27,4 +27,4 @@ const fireUp = require('fire-up').newInjector({ ] }); -module.exports = fireUp; \ No newline at end of file +module.exports = fireUp; http://git-wip-us.apache.org/repos/asf/ignite/blob/ffdf3d9e/modules/web-console/src/main/js/test/backend/unit/CacheService.test.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/test/backend/unit/CacheService.test.js b/modules/web-console/src/main/js/test/backend/unit/CacheService.test.js index 8d9f059..88f463a 100644 --- a/modules/web-console/src/main/js/test/backend/unit/CacheService.test.js +++ b/modules/web-console/src/main/js/test/backend/unit/CacheService.test.js @@ -19,12 +19,21 @@ import {assert} from 'chai'; import fireUp from '../injector'; import testCaches from '../data/caches.json'; +import testAccounts from '../data/accounts.json'; +import testSpaces from '../data/spaces.json'; -let cacheService, mongo, errors; +let cacheService; +let mongo; +let errors; + +suite('SpaceService', () => { + + const injectSpaceInCaches = (spaceId) => { + return testCaches.map((cache) => ({...cache, space: spaceId})); + }; -suite('CacheService', () => { suiteSetup(() => { - return Promise.all([fireUp('services/cacheService'), fireUp('mongo'), fireUp('errors')]) + return Promise.all([fireUp('services/cache'), fireUp('mongo'), fireUp('errors')]) .then(([_cacheService, _mongo, _errors]) => { mongo = _mongo; cacheService = _cacheService; @@ -40,7 +49,7 @@ suite('CacheService', () => { test('Cache merge', (done) => { return cacheService.merge(testCaches[0]) - .then((cacheId)=> { + .then((cacheId) => { assert.isNotNull(cacheId); return cacheId; @@ -49,7 +58,7 @@ suite('CacheService', () => { return mongo.Cache.findById(cacheId) .then((cache) => { assert.isNotNull(cache); - }) + }); }) .then(done) .catch(done); @@ -61,41 +70,43 @@ suite('CacheService', () => { .catch((err) => { assert.instanceOf(err, errors.DuplicateKeyException); - done() - }) + done(); + }); }); - test('Remove cache', (done)=> { + test('Remove cache', (done) => { return cacheService.merge(testCaches[0]) - .then((cacheId)=> { + .then((cacheId) => { assert.isNotNull(cacheId); return mongo.Cache.findById(cacheId) - .then((cache)=> { + .then((cache) => { assert.isNotNull(cache); return cache; }) .then(cacheService.remove) - .then(() => { + .then((results) => { + assert.equal(results.rowsAffected, 1); + return mongo.Cache.findById(cacheId) .then((notFoundCache) => { assert.isNull(notFoundCache); - }) - }) + }); + }); }) .then(done) .catch(done); }); - test('Remove all caches for user', (done) => { - return Promise.all([cacheService.merge(testCaches[0]), cacheService.merge(testCaches[1])]) - .then((results) => { - - }) - .then(done) - .catch(done); + // TODO implement test + test('Remove all caches by user', (done) => { + done(); }); -}); \ No newline at end of file + // TODO Implement test + test('Load all caches by space', (done) => { + done(); + }); +});
