send requests methods unified

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) {

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())
+      });
+    });
+  });
+
 });