wlxml: lists - extractListItems

[fnpeditor.git] / 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 0f01486..346a82b 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/canvas.test.js
+++ b/src/editor/modules/documentCanvas/canvas/canvas.test.js
@@ -3,10 +3,9 @@ define([
 'libs/chai',
 'libs/sinon',
 'modules/documentCanvas/canvas/canvas',
 'libs/chai',
 'libs/sinon',
 'modules/documentCanvas/canvas/canvas',

-'modules/documentCanvas/canvas/documentElement',

 'modules/documentCanvas/canvas/utils',
 'wlxml/wlxml'
 'modules/documentCanvas/canvas/utils',
 'wlxml/wlxml'

-], function($, chai, sinon, canvas, documentElement, utils, wlxml) {
+], function($, chai, sinon, canvas, utils, wlxml) {

     
 'use strict';
 /* global describe, it, beforeEach, afterEach */
     
 'use strict';
 /* global describe, it, beforeEach, afterEach */


@@ -34,6 +33,7 @@ describe('new Canvas', function() {
 
         expect(c.doc().children()).to.have.length(3);
         expect(c.doc().children()[0].canvas).to.equal(c);
 
         expect(c.doc().children()).to.have.length(3);
         expect(c.doc().children()[0].canvas).to.equal(c);

+        expect(c.doc().children()[0].wlxmlNode.sameNode(doc.root));

     });
 });
 
     });
 });
 


@@ -58,7 +58,7 @@ describe('Handling changes to the document', function() {
             c = canvas.fromXMLDocument(doc);
 
         var header = doc.root.replaceWith({tagName: 'header'});
             c = canvas.fromXMLDocument(doc);
 
         var header = doc.root.replaceWith({tagName: 'header'});

-        expect(c.doc().data('wlxmlNode').sameNode(header)).to.equal(true);
+        expect(c.doc().wlxmlNode.sameNode(header)).to.equal(true);

     });
 });
 
     });
 });
 


@@ -104,7 +104,7 @@ describe('Listening to document changes', function() {
 
         /* Make sure we handle invalidation of reference to wlxmlNode after changing its tag */
         expect(headerNode.getData('canvasElement').sameNode(headerElement)).to.equal(true, 'node->element');
 
         /* Make sure we handle invalidation of reference to wlxmlNode after changing its tag */
         expect(headerNode.getData('canvasElement').sameNode(headerElement)).to.equal(true, 'node->element');

-        expect(headerElement.data('wlxmlNode').sameNode(headerNode)).to.equal(true, 'element->node');
+        expect(headerElement.wlxmlNode.sameNode(headerNode)).to.equal(true, 'element->node');

     });
 
     it('Handles nodeDetached event for an empty text node', function(done) {
     });
 
     it('Handles nodeDetached event for an empty text node', function(done) {


@@ -120,7 +120,7 @@ describe('Listening to document changes', function() {
         wait(function() {
             var parent = aTextElement.parent();
             expect(aTextElement.getText({raw:true})).to.equal(utils.unicode.ZWS, 'canvas represents this as empty node');
         wait(function() {
             var parent = aTextElement.parent();
             expect(aTextElement.getText({raw:true})).to.equal(utils.unicode.ZWS, 'canvas represents this as empty node');

-            aTextElement.data('wlxmlNode').detach();
+            aTextElement.wlxmlNode.detach();

             expect(parent.children().length).to.equal(1);
             expect(parent.children()[0].getWlxmlTag()).to.equal('span');
             done();
             expect(parent.children().length).to.equal(1);
             expect(parent.children()[0].getWlxmlTag()).to.equal('span');
             done();


@@ -191,8 +191,7 @@ describe('Cursor', function() {
             textFirst = findTextNode(dom, 'Alice'),
             textSecond = findTextNode(dom, 'has a cat'),
             textAbc = findTextNode(dom, 'abc'),
             textFirst = findTextNode(dom, 'Alice'),
             textSecond = findTextNode(dom, 'has a cat'),
             textAbc = findTextNode(dom, 'abc'),

-            textCde = findTextNode(dom, 'cde'),
-            cursor, label;
+            textCde = findTextNode(dom, 'cde');

 
         var check = function(label, expected) {
             var cursor = c.getCursor();
 
         var check = function(label, expected) {
             var cursor = c.getCursor();


@@ -201,7 +200,7 @@ describe('Cursor', function() {
             expect(cursor.getSelectionStart().offset).to.equal(expected.start.offset, label + 'start offset ok');
             expect(cursor.getSelectionEnd().element.getText()).to.equal(expected.end.text, label + 'end element ok');
             expect(cursor.getSelectionEnd().offset).to.equal(expected.end.offset, label + 'end offset ok');
             expect(cursor.getSelectionStart().offset).to.equal(expected.start.offset, label + 'start offset ok');
             expect(cursor.getSelectionEnd().element.getText()).to.equal(expected.end.text, label + 'end element ok');
             expect(cursor.getSelectionEnd().offset).to.equal(expected.end.offset, label + 'end offset ok');

-        }
+        };

 
         getSelection.returns({
             anchorNode: textFirst,
 
         getSelection.returns({
             anchorNode: textFirst,