From 4151727544d7793ba8d55968841bc577aadc9078 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 12 Feb 2018 14:09:33 +0100
Subject: [PATCH] fix on unittests after merge
---
frontend-js/package-lock.json | 14 ++++++++++++++
frontend-js/src/test/js/map/CustomMap-test.js | 2 ++
...ount=100&query=some_query&token=MOCK_TOKEN_ID&} | 0
3 files changed, 16 insertions(+)
rename frontend-js/testFiles/apiCalls/projects/complex_model_with_images/models/all/bioEntities.search/{query=some_query&token=MOCK_TOKEN_ID& => count=100&query=some_query&token=MOCK_TOKEN_ID&} (100%)
diff --git a/frontend-js/package-lock.json b/frontend-js/package-lock.json
index 90394fa159..1741782522 100644
--- a/frontend-js/package-lock.json
+++ b/frontend-js/package-lock.json
@@ -821,6 +821,11 @@
"randombytes": "2.0.5"
}
},
+ "cssfilter": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+ "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4="
+ },
"cssom": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
@@ -3437,6 +3442,15 @@
"integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
"dev": true
},
+ "xss": {
+ "version": "0.3.7",
+ "resolved": "https://registry.npmjs.org/xss/-/xss-0.3.7.tgz",
+ "integrity": "sha512-jq7Wo30jFf4hHBG6GIIbdmY/COjd9M7MA5Jz+jt822qePKsFXtDUYqNTDRMJo51vvuh0VEZCtFiuRDonFZWL1g==",
+ "requires": {
+ "commander": "2.11.0",
+ "cssfilter": "0.0.10"
+ }
+ },
"xtend": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/frontend-js/src/test/js/map/CustomMap-test.js b/frontend-js/src/test/js/map/CustomMap-test.js
index b8e6bb1e67..7e4600d0a0 100644
--- a/frontend-js/src/test/js/map/CustomMap-test.js
+++ b/frontend-js/src/test/js/map/CustomMap-test.js
@@ -229,6 +229,8 @@ describe('CustomMap', function () {
}).then(function () {
//after opening submap nothing should change
assert.equal(1, filledSubmap.selectedLayoutOverlays[overlayId].length);
+ }).finally(function(){
+ return customMap.destroy();
});
});
diff --git a/frontend-js/testFiles/apiCalls/projects/complex_model_with_images/models/all/bioEntities.search/query=some_query&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/projects/complex_model_with_images/models/all/bioEntities.search/count=100&query=some_query&token=MOCK_TOKEN_ID&
similarity index 100%
rename from frontend-js/testFiles/apiCalls/projects/complex_model_with_images/models/all/bioEntities.search/query=some_query&token=MOCK_TOKEN_ID&
rename to frontend-js/testFiles/apiCalls/projects/complex_model_with_images/models/all/bioEntities.search/count=100&query=some_query&token=MOCK_TOKEN_ID&
--
GitLab