Skip to content
Snippets Groups Projects
Verified Commit aa094aa3 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

TST: fix tests

parent d6c9fba6
No related branches found
No related tags found
No related merge requests found
...@@ -161,11 +161,14 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c ...@@ -161,11 +161,14 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
for (let result of (await results)) { for (let result of (await results)) {
if (result.length !== 1) { if (result.length !== 1) {
throw new Error("Invalid datamodel"); throw new Error("Invalid datamodel");
} else if (getEntityName(result[0]).toLowerCase() === _datamodel.revisionOf.toLowerCase()) { }
var name = getEntityName(result[0]);
if (name && name.toLowerCase() === _datamodel.revisionOf.toLowerCase()) {
_datamodel._revisionOfId = getEntityID(result[0]); _datamodel._revisionOfId = getEntityID(result[0]);
_datamodel.revisionOf = getEntityName(result[0]); _datamodel.revisionOf = name;
} else if (getEntityName(result[0]).toLowerCase() === _datamodel.obsolete.toLowerCase()) { } else if (name && name.toLowerCase() === _datamodel.obsolete.toLowerCase()) {
_datamodel.obsolete = getEntityName(result[0]); _datamodel.obsolete = name;
} }
} }
}; };
......
...@@ -92,7 +92,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) { ...@@ -92,7 +92,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
var query_fun = async function(query) { var query_fun = async function(query) {
assert.ok(query.startsWith("FIND") && ( query.endsWith(datamodel.obsolete) || query.endsWith(datamodel.revisionOf)), query); assert.ok(query.startsWith("FIND") && ( query.endsWith(datamodel.obsolete) || query.endsWith(datamodel.revisionOf)), query);
done_query(); // called twice done_query(); // called twice
return [$(`<div name="${datamodel.revisionOf}" data-caosdb-id="3456"/>`)[0]]; return [$(`<div data-entity-name="${datamodel.revisionOf}" data-caosdb-id="3456"/>`)[0]];
} }
// injecting the server mock-up responses. // injecting the server mock-up responses.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment