From aa094aa3b2e974e62a51802840bc9927b4b995c7 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 17 Feb 2020 14:52:01 +0100
Subject: [PATCH] TST: fix tests
---
src/core/js/ext_revisions.js | 11 +++++++----
test/core/js/modules/ext_revisions.js.js | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/core/js/ext_revisions.js b/src/core/js/ext_revisions.js
index 2119a470..cf0da0c7 100644
--- a/src/core/js/ext_revisions.js
+++ b/src/core/js/ext_revisions.js
@@ -161,11 +161,14 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
for (let result of (await results)) {
if (result.length !== 1) {
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.revisionOf = getEntityName(result[0]);
- } else if (getEntityName(result[0]).toLowerCase() === _datamodel.obsolete.toLowerCase()) {
- _datamodel.obsolete = getEntityName(result[0]);
+ _datamodel.revisionOf = name;
+ } else if (name && name.toLowerCase() === _datamodel.obsolete.toLowerCase()) {
+ _datamodel.obsolete = name;
}
}
};
diff --git a/test/core/js/modules/ext_revisions.js.js b/test/core/js/modules/ext_revisions.js.js
index 7b867aca..bd9787af 100644
--- a/test/core/js/modules/ext_revisions.js.js
+++ b/test/core/js/modules/ext_revisions.js.js
@@ -92,7 +92,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
var query_fun = async function(query) {
assert.ok(query.startsWith("FIND") && ( query.endsWith(datamodel.obsolete) || query.endsWith(datamodel.revisionOf)), query);
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.
--
GitLab