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

Fix tests

parent e8b9d0ca
Branches
Tags
No related merge requests found
......@@ -75,16 +75,18 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
logger.debug("insert obsolete", id);
// create new obsolete entity from the original
var obsolete = await transaction.retrieveEntityById(id);
const obsolete = await transaction.retrieveEntityById(id);
$(obsolete).attr("id", "-1");
$(obsolete).find("Permissions").remove();
$(obsolete).find("Parent").remove();
$(obsolete).append(`<Parent name="${_datamodel.obsolete}"/>`);
var doc = _createDocument("Request");
const doc = _createDocument("Request");
doc.firstElementChild.appendChild(obsolete);
var result = await transaction.insertEntitiesXml(doc);
return $(result.firstElementChild).find("[id]").first().attr("id");
const result = await transaction.insertEntitiesXml(doc);
const obsolete_id = $(result.firstElementChild).find("[id]").first().attr("id");
logger.trace("leave _insert_obsolete", obsolete_id);
return obsolete_id;
};
/**
......@@ -98,11 +100,12 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
* @returns {string} A HTML represesentation of an entity property.
*/
var _make_revision_of_property = async function (obsolete_id) {
logger.debug("_make_revision_of_property", obsolete_id);
var ret = (await transformation.transformProperty(str2xml(`<Response><Property id="${_datamodel._revisionOfId}" name="${_datamodel.revisionOf}" datatype="${_datamodel.obsolete}"></Property></Response>`))).firstElementChild;
logger.trace("enter _make_revision_of_property", obsolete_id);
const ret = (await transformation.transformProperty(str2xml(`<Response><Property id="${_datamodel._revisionOfId}" name="${_datamodel.revisionOf}" datatype="${_datamodel.obsolete}"></Property></Response>`))).firstElementChild;
$(ret).append(`<div class="caosdb-property-edit-value"><select><option value="${obsolete_id}" selected="selected"></option></select></div>`);
$(ret).find(".caosdb-f-property-value").append(`<div class="caosdb-property-edit-value"><select><option value="${obsolete_id}" selected="selected"></option></select></div>`);
logger.trace("leave _make_revision_of_property", ret);
return ret;
}
......@@ -215,6 +218,7 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
// private members, exposed for testing
_make_revision_of_property: _make_revision_of_property,
_datamodel: _datamodel,
_logger: logger,
}
}($, log.getLogger("ext_revisions"), edit_mode, getEntityID, transaction, _createDocument);
......
......@@ -33,6 +33,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
this.original_insert = transaction.insertEntitiesXml;
this.original_retrieve = transaction.retrieveEntityById;
this.original_query = query;
ext_revisions._logger.setLevel("trace");
},
beforeEach: function (assert) {
// setup before each test
......@@ -80,6 +81,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
assert.equal(rec.id, "-1", "insert with tmp id");
assert.equal($(rec).find("Parent").attr("name"), datamodel.obsolete, "Obsolete Parent");
xml.firstElementChild.firstElementChild.id = "2345";
console.log(xml2str(xml));
done();
return xml;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment