X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/2e14f0181735b7acd0da023eb4c9524b75a45b56..25dbd250996753d1fbd63201fe75a87949c106d6:/src/editor/modules/documentCanvas/canvas/canvas.test.js
diff --git a/src/editor/modules/documentCanvas/canvas/canvas.test.js b/src/editor/modules/documentCanvas/canvas/canvas.test.js
index 63ef243..be4a8b9 100644
--- a/src/editor/modules/documentCanvas/canvas/canvas.test.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.test.js
@@ -125,7 +125,7 @@ describe('Listening to document changes', function() {
aTextElement;
canvas.fromXMLDocument(doc);
- aTextElement = utils.findCanvasElementInParent(aTextNode, aTextNode.parent()); // TODO: This really should be easier...
+ aTextElement = utils.getElementForNode(aTextNode);
aTextElement.setText('');
@@ -208,16 +208,42 @@ describe('Default document changes handling', function() {
});
it('handles moved node', function() {
- var doc = getDocumentFromXML(''),
- a = doc.root.contents()[0],
- b = doc.root.contents()[1],
- c = canvas.fromXMLDocument(doc);
+ var doc = getDocumentFromXML(''),
+ c = doc.root.contents()[0],
+ a = doc.root.contents()[1],
+ b = doc.root.contents()[2],
+ cv = canvas.fromXMLDocument(doc);
+
+ a.document.transaction(function() {
+ a.before(b); // => cab
+ b.after(c); // => bca
+ }, {
+ error: function(e) {throw e;}
+ });
- a.before(b);
+ var sectionChildren = cv.doc().children();
+ expect(sectionChildren.length).to.equal(3);
+ expect(sectionChildren[0].wlxmlNode.getTagName()).to.equal('b');
+ expect(sectionChildren[1].wlxmlNode.getTagName()).to.equal('c');
+ expect(sectionChildren[2].wlxmlNode.getTagName()).to.equal('a');
+ });
+
+ it('handles moving text node to another parent', function() {
+ var c = getCanvasFromXML(''),
+ doc = c.wlxmlDocument,
+ text = doc.root.contents()[0],
+ div = doc.root.contents()[1];
+
+ div.append(text);
+
var sectionChildren = c.doc().children();
expect(sectionChildren.length).to.equal(2);
- expect(sectionChildren[0].wlxmlNode.getTagName()).to.equal('b');
- expect(sectionChildren[1].wlxmlNode.getTagName()).to.equal('a');
+ expect(sectionChildren[0].wlxmlNode.sameNode(div)).to.equal(true);
+ expect(sectionChildren[1].getText()).to.equal('a cat.');
+
+ expect(div.contents().length).to.equal(2);
+ expect(div.contents()[0].getTagName()).to.equal('span');
+ expect(div.contents()[1].getText()).to.equal('Alice');
});
it('handles change in a text node', function() {
@@ -225,6 +251,19 @@ describe('Default document changes handling', function() {
c.wlxmlDocument.root.contents()[0].setText('cat');
expect(c.doc().children()[0].getText()).to.equal('cat');
});
+
+ describe('Regression tests', function() {
+ it('handles moving node after its next neighbour correctly', function() {
+ var c = getCanvasFromXML(''),
+ doc = c.wlxmlDocument,
+ a = doc.root.contents()[0],
+ b = doc.root.contents()[1];
+ b.after(a);
+ var sectionChildren = c.doc().children();
+ expect(sectionChildren[0].wlxmlNode.getTagName()).to.equal('b');
+ expect(sectionChildren[1].wlxmlNode.getTagName()).to.equal('a');
+ });
+ });
});
describe('Custom elements based on wlxml class attribute', function() {
@@ -254,7 +293,11 @@ describe('Custom elements based on wlxml class attribute', function() {
onNodeAdded: function(event) {
void(event);
this.refresh2();
- }
+ },
+ onNodeTextChange: function(event) {
+ this.header.text(event.meta.node.getText());
+ },
+ children: function() { return []; }
});
var c = getCanvasFromXML('', [
@@ -270,6 +313,14 @@ describe('Custom elements based on wlxml class attribute', function() {
node.append({tagName: 'div'});
expect(header.text()).to.equal('2', 'added div');
+
+ var textNode = node.append({text: 'test'});
+
+ expect(header.text()).to.equal('3', 'added text node');
+
+ textNode.setText('test2');
+
+ expect(header.text()).to.equal('test2', 'text node change handled');
});
describe('Handling unknown class', function() {