diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js index 87f6154007c897eaa60fb10eea6c395b77a0b8c0..405775ce2da299b3b7be51e38ec9f6d0457edaf8 100644 --- a/frontend-js/src/main/js/ServerConnector.js +++ b/frontend-js/src/main/js/ServerConnector.js @@ -121,7 +121,10 @@ ServerConnector.readFile = function(url, description) { ServerConnector._readFile = function(url) { return new Promise(function(resolve, reject) { - request.get(url, function(error, response, body) { + request({ + method : "GET", + url : url + }, function(error, response, body) { if (error) { reject(error); } else if (response.statusCode !== 200) { @@ -144,7 +147,8 @@ ServerConnector.sendPostRequest = function(url, params) { window.location.reload(false); } return new Promise(function(resolve, reject) { - request.post({ + request({ + method : "POST", url : url, form : params }, function(error, response, body) { @@ -174,7 +178,8 @@ ServerConnector.sendPutRequest = function(url, params) { window.location.reload(false); } return new Promise(function(resolve, reject) { - request.put({ + request({ + method : "POST", url : url, form : params }, function(error, response, body) { diff --git a/frontend-js/src/test/js/ServerConnector-test.js b/frontend-js/src/test/js/ServerConnector-test.js index fe4a80c10f2a24b1cf648c6d98891a698e35cf73..1518d2ead490d316d589fa552ee69c1f34d454e8 100644 --- a/frontend-js/src/test/js/ServerConnector-test.js +++ b/frontend-js/src/test/js/ServerConnector-test.js @@ -256,4 +256,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()) + }); + }); + }); + });