From 31c866e4c149f0342e5e0edcca6169302b071125 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 11 Aug 2017 18:09:11 +0200
Subject: [PATCH] send requests methods unified
---
frontend-js/src/main/js/ServerConnector.js | 11 +++++---
.../src/test/js/ServerConnector-test.js | 26 +++++++++++++++++++
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 87f6154007..405775ce2d 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 fe4a80c10f..1518d2ead4 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())
+ });
+ });
+ });
+
});
--
GitLab