Represent empty wlxml nodes as DocumentNodeElement with empty DocumentTextElement

[fnpeditor.git] / modules / documentCanvas / canvas / canvas.test3.js

diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js
index ff30843..477aca0 100644 (file)
--- a/modules/documentCanvas/canvas/canvas.test3.js
+++ b/modules/documentCanvas/canvas/canvas.test3.js
@@ -250,12 +250,24 @@ describe('Canvas', function() {
                         expect(children[2]).to.be.instanceOf(documentElement.DocumentTextElement);
                     });
             });
-            
-            describe('white characters handling', function() {
-                it('says empty element node has no children', function() {
+
+            describe('empty nodes handling', function() {
+                it('says empty element node from XML source has one empty DocumentTextElement', function() {
                     var c = canvas.fromXML('<section></section>');
-                    expect(c.doc().children().length).to.equal(0);
+                    expect(c.doc().children()).to.have.length(1);
+                    expect(c.doc().children()[0].getText()).to.equal('');
+                });
+
+                it('allows creation of an empty element node', function() {
+                    var c = canvas.fromXML('<section></section>'),
+                        section = c.doc(),
+                        header = section.append({tag: 'header'});
+                    expect(header.children()).to.have.length(0);
                 });
+            });
+            
+            describe('white characters handling', function() {
+
                 it('says element node with one space has one DocumentTextElement', function() {
                     var c = canvas.fromXML('<section> </section>');
                     expect(c.doc().children().length).to.equal(1);
@@ -330,22 +342,22 @@ describe('Canvas', function() {
 
             describe('Basic Element inserting', function() {
                 it('can put new NodeElement at the end', function() {
-                    var c = canvas.fromXML('<section></section>'),
+                    var c = canvas.fromXML('<section><div></div></section>'),
                         appended = c.doc().append({tag: 'header', klass: 'some.class'}),
                         children = c.doc().children();
 
-                    expect(children.length).to.equal(1);
-                    expect(children[0].sameNode(appended)).to.be.true;
+                    expect(children.length).to.equal(2);
+                    expect(children[1].sameNode(appended)).to.be.true;
                 });
 
                 it('can put new TextElement at the end', function() {
-                    var c = canvas.fromXML('<section></section>'),
+                    var c = canvas.fromXML('<section><div><div></section>'),
                         appended = c.doc().append({text: 'Alice'}),
                         children = c.doc().children();
 
-                    expect(children.length).to.equal(1);
-                    expect(children[0].sameNode(appended)).to.be.true;
-                    expect(children[0].getText()).to.equal('Alice');
+                    expect(children.length).to.equal(2);
+                    expect(children[1].sameNode(appended)).to.be.true;
+                    expect(children[1].getText()).to.equal('Alice');
                 });
 
                 it('can put new NodeElement at the beginning', function() {
@@ -458,6 +470,22 @@ describe('Canvas', function() {
                 });
             });
 
+            describe('Removing elements', function() {
+                it('merges left and right DocumentTextElement sibling of a detached DocumentNodeElement', function() {
+                    var c = canvas.fromXML('<section>Alice<div>has</div>a cat</section>'),
+                        section = c.doc(),
+                        div = section.children()[1];
+
+                    div.detach();
+
+                    var sectionChildren = section.children(),
+                        textElement = sectionChildren[0];
+
+                    expect(sectionChildren).to.have.length(1);
+                    expect(textElement.getText()).to.equal('Alicea cat');
+                });
+            });
+
             describe('Splitting text', function() {
                 
                 it('splits DocumentTextElement\'s parent into two DocumentNodeElements of the same type', function() {
@@ -686,8 +714,26 @@ describe('Canvas', function() {
                 });
             });
 
-            describe('unwrapping', function() {
-                it('unwraps DocumentTextElement from its parent DocumentNodeElement if it\'s its only child', function() {
+            describe('unwrapping DocumentTextElement from its parent DocumentNodeElement if it\'s its only child', function() {
+                it('unwraps text element from its parent and stays between its old parent siblings', function() {
+                    var c = canvas.fromXML('<section><div>Alice</div><div>has</div><div>a cat</div></section>'),
+                        section = c.doc(),
+                        sectionChildren = section.children(),
+                        divAlice = sectionChildren[0],
+                        divHas = sectionChildren[1],
+                        textHas = divHas.children()[0],
+                        divCat = sectionChildren[2];
+
+                    var newTextContainer = textHas.unwrap(),
+                        sectionChildren = section.children();
+
+                    expect(sectionChildren[0].sameNode(divAlice)).to.equal(true, 'divAlice ok');
+                    expect(newTextContainer.sameNode(section)).to.equal(true, 'unwrap returns new text parent DocumentNodeElement');
+                    expect(sectionChildren[1].getText()).to.equal('has');
+                    expect(sectionChildren[2].sameNode(divCat)).to.equal(true, 'divCat ok');
+
+                });
+                it('unwraps and join with its old parent adjacent text elements ', function() {
                     var c = canvas.fromXML('<section>Alice <span>has a</span> cat</section>'),
                     section = c.doc(),
                     text = section.children()[1].children()[0];
@@ -697,7 +743,20 @@ describe('Canvas', function() {
                     expect(section.children().length).to.equal(1, 'section has one child');
                     expect(section.children()[0].getText()).to.equal('Alice has a cat');
                     expect(newTextContainer.sameNode(c.doc())).to.equal(true, 'unwrap returns new text parent DocumentNodeElement');
-                })
+                });
+
+                it('unwraps text element from its parent - first child case', function() {
+                    var c = canvas.fromXML('<section><span class="uri">Some</span>text</section>'),
+                        section = c.doc(),
+                        span = section.children()[0];
+
+                    span.children()[0].unwrap();
+
+                    var sectionChildren = section.children();
+
+                    expect(sectionChildren).to.have.length(1);
+                    expect(sectionChildren[0].getText()).to.equal('Sometext');
+                });
             });
         });
 
@@ -1303,8 +1362,9 @@ describe('Canvas', function() {
 
             it('keeps white space between XML nodes - inline case', function() {
                 var xmlIn = '<section>\n\n\n<span></span>\n\n\n<span></span>\n\n\n</section>',
-                c = canvas.fromXML(xmlIn),
-                xmlOut = c.toXML();
+                c = canvas.fromXML(xmlIn);
+                
+                var xmlOut = c.toXML();
 
                 var partsIn = xmlIn.split('\n\n\n'),
                     partsOut = xmlOut.split('\n\n\n');