From dab203a01b1662874347b05f71d6fab061be226b Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Thu, 1 Jun 2017 13:47:00 +0200 Subject: [PATCH] test files with responses from API contain method name --- frontend-js/src/test/js/ServerConnector-mock.js | 6 +++--- ...ame=&pinned=false&projectId=sample&token=MOCK_TOKEN_ID&} | 0 ...t&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID&} | 0 ...T_overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID&} | 0 ...2&overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID&} | 0 .../login/{login=&password=& => POST_login=&password=&} | 0 .../user/login/{login=anonymous& => POST_login=anonymous&} | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename frontend-js/testFiles/apiCalls/comment/addComment/{content=&coordinates=2.00%2C12.00&elementId=&elementType=POINT&email=&modelId=102&name=&pinned=false&projectId=sample&token=MOCK_TOKEN_ID& => POST_content=&coordinates=2.00%2C12.00&elementId=&elementType=POINT&email=&modelId=102&name=&pinned=false&projectId=sample&token=MOCK_TOKEN_ID&} (100%) rename frontend-js/testFiles/apiCalls/overlay/addOverlay/{content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID& => POST_content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID&} (100%) rename frontend-js/testFiles/apiCalls/overlay/removeOverlay/{overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& => POST_overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID&} (100%) rename frontend-js/testFiles/apiCalls/overlay/updateOverlay/{description=test%20desc2&name=test%20nam2&overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& => POST_description=test%20desc2&name=test%20nam2&overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID&} (100%) rename frontend-js/testFiles/apiCalls/user/login/{login=&password=& => POST_login=&password=&} (100%) rename frontend-js/testFiles/apiCalls/user/login/{login=anonymous& => POST_login=anonymous&} (100%) diff --git a/frontend-js/src/test/js/ServerConnector-mock.js b/frontend-js/src/test/js/ServerConnector-mock.js index fa21874b4c..74211c8d30 100644 --- a/frontend-js/src/test/js/ServerConnector-mock.js +++ b/frontend-js/src/test/js/ServerConnector-mock.js @@ -73,7 +73,7 @@ ServerConnectorMock.sendPostRequest = function(url, params) { } }); } else { - var mockUrl = url + "/" + self.createGetParams(encodeParams(params)); + var mockUrl = url + "/POST_" + self.createGetParams(encodeParams(params)); fs.readFile(mockUrl, 'utf8', function(err, content) { if (err) { reject(err); @@ -103,7 +103,7 @@ ServerConnectorMock.sendPutRequest = function(url, params) { } }); } else { - var mockUrl = url + "/" + self.createGetParams(encodeParams(params)); + var mockUrl = url + "/PUT_" + self.createGetParams(encodeParams(params)); fs.readFile(mockUrl, 'utf8', function(err, content) { if (err) { reject(err); @@ -133,7 +133,7 @@ ServerConnectorMock.sendDeleteRequest = function(url, params) { } }); } else { - var mockUrl = url + "/" + self.createGetParams(encodeParams(params)); + var mockUrl = url + "/DELETE_" + self.createGetParams(encodeParams(params)); fs.readFile(mockUrl, 'utf8', function(err, content) { if (err) { reject(err); diff --git a/frontend-js/testFiles/apiCalls/comment/addComment/content=&coordinates=2.00%2C12.00&elementId=&elementType=POINT&email=&modelId=102&name=&pinned=false&projectId=sample&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/comment/addComment/POST_content=&coordinates=2.00%2C12.00&elementId=&elementType=POINT&email=&modelId=102&name=&pinned=false&projectId=sample&token=MOCK_TOKEN_ID& similarity index 100% rename from frontend-js/testFiles/apiCalls/comment/addComment/content=&coordinates=2.00%2C12.00&elementId=&elementType=POINT&email=&modelId=102&name=&pinned=false&projectId=sample&token=MOCK_TOKEN_ID& rename to frontend-js/testFiles/apiCalls/comment/addComment/POST_content=&coordinates=2.00%2C12.00&elementId=&elementType=POINT&email=&modelId=102&name=&pinned=false&projectId=sample&token=MOCK_TOKEN_ID& diff --git a/frontend-js/testFiles/apiCalls/overlay/addOverlay/content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/overlay/addOverlay/POST_content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID& similarity index 100% rename from frontend-js/testFiles/apiCalls/overlay/addOverlay/content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID& rename to frontend-js/testFiles/apiCalls/overlay/addOverlay/POST_content=name%20color%0ACAPN1%20%2300FF00%0APARK7%20%23AC0000%0AL-cysteine%20%20%230000AC%0Aglutathione%20%23005050%0A&description=test%20desc&filename=test.txt&name=test%20nam&projectId=sample&token=MOCK_TOKEN_ID& diff --git a/frontend-js/testFiles/apiCalls/overlay/removeOverlay/overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/overlay/removeOverlay/POST_overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& similarity index 100% rename from frontend-js/testFiles/apiCalls/overlay/removeOverlay/overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& rename to frontend-js/testFiles/apiCalls/overlay/removeOverlay/POST_overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& diff --git a/frontend-js/testFiles/apiCalls/overlay/updateOverlay/description=test%20desc2&name=test%20nam2&overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/overlay/updateOverlay/POST_description=test%20desc2&name=test%20nam2&overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& similarity index 100% rename from frontend-js/testFiles/apiCalls/overlay/updateOverlay/description=test%20desc2&name=test%20nam2&overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& rename to frontend-js/testFiles/apiCalls/overlay/updateOverlay/POST_description=test%20desc2&name=test%20nam2&overlayId=17296&projectId=sample&token=MOCK_TOKEN_ID& diff --git a/frontend-js/testFiles/apiCalls/user/login/login=&password=& b/frontend-js/testFiles/apiCalls/user/login/POST_login=&password=& similarity index 100% rename from frontend-js/testFiles/apiCalls/user/login/login=&password=& rename to frontend-js/testFiles/apiCalls/user/login/POST_login=&password=& diff --git a/frontend-js/testFiles/apiCalls/user/login/login=anonymous& b/frontend-js/testFiles/apiCalls/user/login/POST_login=anonymous& similarity index 100% rename from frontend-js/testFiles/apiCalls/user/login/login=anonymous& rename to frontend-js/testFiles/apiCalls/user/login/POST_login=anonymous& -- GitLab