Commit 4da44009 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '653-change-warning-message-in-proper-branch' into 'devel_12.1.x'

changed warning text

See merge request !600
parents f1fe0b2d 6c976c8f
Pipeline #8511 passed with stage
in 1 minute and 55 seconds
...@@ -434,7 +434,7 @@ AliasInfoWindow.prototype.createGenomicDiv = function (params) { ...@@ -434,7 +434,7 @@ AliasInfoWindow.prototype.createGenomicDiv = function (params) {
} }
if (geneticInformation) { if (geneticInformation) {
if (genomeUrls.length === 0) { if (genomeUrls.length === 0) {
contentElement.innerHTML = "No reference genome data available on minerva platform"; contentElement.innerHTML = "No organism defined for this project, cannot display variant data";
} else { } else {
for (i = 0; i < overlaysData.length; i++) { for (i = 0; i < overlaysData.length; i++) {
if (globalGeneVariants[i].length > 0) { if (globalGeneVariants[i].length > 0) {
......
...@@ -271,7 +271,7 @@ describe('AliasInfoWindow', function () { ...@@ -271,7 +271,7 @@ describe('AliasInfoWindow', function () {
return win.createGenomicDiv({overlays: [overlay]}); return win.createGenomicDiv({overlays: [overlay]});
}).then(function (div) { }).then(function (div) {
assert.ok(div); assert.ok(div);
assert.ok(div.innerHTML.indexOf("No reference genome data available on minerva platform") === -1); assert.ok(div.innerHTML.indexOf("No organism defined for this project, cannot display variant data") === -1);
win.destroy(); win.destroy();
}); });
...@@ -301,7 +301,7 @@ describe('AliasInfoWindow', function () { ...@@ -301,7 +301,7 @@ describe('AliasInfoWindow', function () {
return win.createGenomicDiv({overlays: overlays}); return win.createGenomicDiv({overlays: overlays});
}).then(function (div) { }).then(function (div) {
assert.ok(div); assert.ok(div);
assert.ok(div.innerHTML.indexOf("No reference genome data available on minerva platform") === -1); assert.ok(div.innerHTML.indexOf("No organism defined for this project, cannot display variant data") === -1);
win.destroy(); win.destroy();
}); });
...@@ -340,7 +340,7 @@ describe('AliasInfoWindow', function () { ...@@ -340,7 +340,7 @@ describe('AliasInfoWindow', function () {
return win.createGenomicDiv({overlays: [overlay]}); return win.createGenomicDiv({overlays: [overlay]});
}).then(function (div) { }).then(function (div) {
assert.ok(div); assert.ok(div);
assert.ok(div.innerHTML.indexOf("No reference genome data available on minerva platform") >= -1); assert.ok(div.innerHTML.indexOf("No organism defined for this project, cannot display variant data") >= -1);
win.destroy(); win.destroy();
}); });
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment