Skip to content
Snippets Groups Projects
Commit 62f40b18 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

API responses fixed for chemical unit tests mocks

parent f5a3715b
No related branches found
No related tags found
1 merge request!201Cellwall annotations
...@@ -204,7 +204,7 @@ GuiUtils.prototype.createAnnotationList = function (annotations, options) { ...@@ -204,7 +204,7 @@ GuiUtils.prototype.createAnnotationList = function (annotations, options) {
// var desc = grouppedAnnotations.keys()[i]; // var desc = grouppedAnnotations.keys()[i];
var groupContainer = (inline ? document.createElement("span") : document.createElement("div")); var groupContainer = (inline ? document.createElement("span") : document.createElement("div"));
var descContainer = (inline ? document.createElement("span") : document.createElement("div")); var descContainer = (inline ? document.createElement("span") : document.createElement("div"));
var annotatorName = annotatorClass ? annotatorsClassMapping[annotatorClass].getName() : "Annotated by curator"; var annotatorName = annotatorClass ? annotatorsClassMapping[annotatorClass].getName() : "Annotated by curator";
if (inline) { if (inline) {
......
...@@ -109,35 +109,36 @@ describe('ChemicalPanel', function () { ...@@ -109,35 +109,36 @@ describe('ChemicalPanel', function () {
}); });
it('on searchResults changed', function () { it('on searchResults changed', function () {
var map = helper.createCustomMap(); return ServerConnector.getProject().then(function (project) {
map.getModel().setId(15781); var map = helper.createCustomMap(project);
var chemicalDbOverlay = helper.createChemicalDbOverlay(map); var chemicalDbOverlay = helper.createChemicalDbOverlay(map);
new ChemicalPanel({
new ChemicalPanel({ element: testDiv,
element: testDiv, customMap: map
customMap: map });
});
return chemicalDbOverlay.searchByQuery("rotenone").then(function () { return chemicalDbOverlay.searchByQuery("rotenone");
assert.equal(logger.getWarnings().length, 1); }).then(function () {
assert.equal(logger.getWarnings().length, 0);
assert.ok(testDiv.innerHTML.indexOf("marker/mechanism") >= 0); assert.ok(testDiv.innerHTML.indexOf("marker/mechanism") >= 0);
}); });
}); });
it('searchByQuery', function () { it('searchByQuery', function () {
var map = helper.createCustomMap(); return ServerConnector.getProject().then(function (project) {
map.getModel().setId(15781); var map = helper.createCustomMap(project);
helper.createChemicalDbOverlay(map); helper.createChemicalDbOverlay(map);
var panel = new ChemicalPanel({ var panel = new ChemicalPanel({
element: testDiv, element: testDiv,
customMap: map customMap: map
}); });
panel.getControlElement(PanelControlElementType.SEARCH_INPUT).value = "rotenone"; panel.getControlElement(PanelControlElementType.SEARCH_INPUT).value = "rotenone";
return panel.searchByQuery().then(function () { return panel.searchByQuery();
assert.equal(logger.getWarnings().length, 1); }).then(function () {
assert.equal(logger.getWarnings().length, 0);
assert.ok(testDiv.innerHTML.indexOf("Rotenone ") >= 0); assert.ok(testDiv.innerHTML.indexOf("Rotenone ") >= 0);
}); });
}); });
...@@ -178,4 +179,5 @@ describe('ChemicalPanel', function () { ...@@ -178,4 +179,5 @@ describe('ChemicalPanel', function () {
}); });
}); })
;
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment