diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js index 4e0172311e20122c15fa8c0ebfd83f39fad71049..597c164b9ac01c1b8122a1f64f1c5cebf26da42b 100644 --- a/frontend-js/src/main/js/ServerConnector.js +++ b/frontend-js/src/main/js/ServerConnector.js @@ -55,8 +55,8 @@ ServerConnector.init = function() { }; ServerConnector.registerListenerType("onDataLoadStart"); ServerConnector.registerListenerType("onDataLoadStop"); - ServerConnector.init(); + ServerConnector.getMinOverlayColorInt = function () { var self = this; return self.getLoggedUser().then(function(user) { @@ -120,9 +120,12 @@ ServerConnector.readFile = function (url, description) { }); }; -ServerConnector._readFile = function (url) { - return new Promise(function (resolve, reject) { - request.get(url, function (error, response, body) { +ServerConnector._readFile = function(url) { + return new Promise(function(resolve, reject) { + request({ + method : "GET", + url : url + }, function(error, response, body) { if (error) { reject(error); } else if (response.statusCode !== 200) { @@ -144,11 +147,12 @@ ServerConnector.sendPostRequest = function (url, params) { self.getSessionData().setLogin(undefined); window.location.reload(false); } - return new Promise(function (resolve, reject) { - request.post({ - url: url, - form: params - }, function (error, response, body) { + return new Promise(function(resolve, reject) { + request({ + method : "POST", + url : url, + form : params + }, function(error, response, body) { if (error) { reject(new NetworkError(error.message, { content: body, @@ -174,11 +178,12 @@ ServerConnector.sendPutRequest = function (url, params) { self.getSessionData().setLogin(undefined); window.location.reload(false); } - return new Promise(function (resolve, reject) { - request.put({ - url: url, - form: params - }, function (error, response, body) { + return new Promise(function(resolve, reject) { + request({ + method : "PUT", + url : url, + form : params + }, function(error, response, body) { if (error) { reject(error); } else if (response.statusCode !== 200) { diff --git a/frontend-js/src/test/js/ServerConnector-test.js b/frontend-js/src/test/js/ServerConnector-test.js index 20d0399e149b37aeadfb1d5a629bd94a2eb79c80..1c4acaf8ac8f84d55df5e43df032f638e91299cd 100644 --- a/frontend-js/src/test/js/ServerConnector-test.js +++ b/frontend-js/src/test/js/ServerConnector-test.js @@ -266,4 +266,30 @@ describe('ServerConnector', function() { + describe('returnUserOrSystemColor ', function() { + it('user has empty color', function() { + var systemColor = {}; + return ServerConnector.returnUserOrSystemColor("", Promise.resolve(systemColor)).then(function(result) { + assert.ok(result = systemColor); + }); + }); + it('user has defined color', function() { + var userColor = {}; + var systemColor = {}; + return ServerConnector.returnUserOrSystemColor(userColor, Promise.resolve(systemColor)).then(function(result) { + assert.ok(result = userColor); + }); + }); + }); + + describe('readFile', function() { + it('check session expired', function() { + ServerConnector.getSessionData().setToken(undefined); + assert.ok(ServerConnector.getSessionData().getLogin()) + return ServerConnector.readFile("package.json", "Downloading projects").then(function() { + assert.notOk(ServerConnector.getSessionData().getLogin()) + }); + }); + }); + });