smartxml: fix - do not clear redo stack if we are just performing undo operation

[fnpeditor.git] / src / wlxml / extensions / list / list.test.js

diff --git a/src/wlxml/extensions/list/list.test.js b/src/wlxml/extensions/list/list.test.js
index f15d75b..faa85da 100644 (file)
--- a/src/wlxml/extensions/list/list.test.js
+++ b/src/wlxml/extensions/list/list.test.js
@@ -6,11 +6,13 @@ var chai = require('libs/chai'),
     wlxml = require('wlxml/wlxml'),
     expect = chai.expect,
     $ = require('libs/jquery'),
     wlxml = require('wlxml/wlxml'),
     expect = chai.expect,
     $ = require('libs/jquery'),

-    lists = require('wlxml/extensions/list/list');
+    listsExtension = require('wlxml/extensions/list/list');

 
 
 var getDocumentFromXML = function(xml, options) {
 
 
 var getDocumentFromXML = function(xml, options) {

-    return wlxml.WLXMLDocumentFromXML(xml, options || {});
+    var doc = wlxml.WLXMLDocumentFromXML(xml, options || {});
+    doc.registerExtension(listsExtension);
+    return doc;

 };
 
 var removeEmptyTextNodes = function(xml) {
 };
 
 var removeEmptyTextNodes = function(xml) {


@@ -28,7 +30,7 @@ var removeEmptyTextNodes = function(xml) {
 };
 
 
 };
 
 

-describe.only('Lists extension', function() {
+describe('Lists extension', function() {

 
     describe('creating lists', function() {
         it('allows creation of a list from existing sibling DocumentElements', function() {
 
     describe('creating lists', function() {
         it('allows creation of a list from existing sibling DocumentElements', function() {


@@ -37,7 +39,7 @@ describe.only('Lists extension', function() {
                 div1 = section.contents()[1],
                 textA = section.contents()[2];
             
                 div1 = section.contents()[1],
                 textA = section.contents()[2];
             

-            doc.transform('createList', {node1: div1, node2: textA});
+            doc.createList({node1: div1, node2: textA});

 
             expect(section.contents().length).to.equal(3, 'section has three child nodes');
 
 
             expect(section.contents().length).to.equal(3, 'section has three child nodes');
 


@@ -70,7 +72,7 @@ describe.only('Lists extension', function() {
                 itemC = outerList.contents('.item')[2];
 
             
                 itemC = outerList.contents('.item')[2];
 
             

-            doc.transform('createList', {node1: itemB, node2: itemC});
+            doc.createList({node1: itemB, node2: itemC});

 
             var outerListItems = outerList.contents('.item'),
                 innerList = outerListItems[1].contents()[0];
 
             var outerListItems = outerList.contents('.item'),
                 innerList = outerListItems[1].contents()[0];


@@ -106,7 +108,7 @@ describe.only('Lists extension', function() {
                 item1 = list.contents()[1],
                 item2 = list.contents()[2];
 
                 item1 = list.contents()[1],
                 item2 = list.contents()[2];
 

-            doc.transform('extractItems', {item1: item1, item2: item2});
+            doc.extractItems({item1: item1, item2: item2});

 
             var section = doc.root,
                 list1 = section.contents()[0],
 
             var section = doc.root,
                 list1 = section.contents()[0],


@@ -145,7 +147,7 @@ describe.only('Lists extension', function() {
                 item2 = list.contents()[1],
                 item3 = list.contents()[2];
 
                 item2 = list.contents()[1],
                 item3 = list.contents()[2];
 

-            doc.transform('extractItems', {item1: item1, item2: item2});
+            doc.extractItems({item1: item1, item2: item2});

 
             var section = doc.root,
                 oldItem1 = section.contents()[0],
 
             var section = doc.root,
                 oldItem1 = section.contents()[0],


@@ -173,7 +175,7 @@ describe.only('Lists extension', function() {
                 item2 = list.contents()[1],
                 item3 = list.contents()[2];
 
                 item2 = list.contents()[1],
                 item3 = list.contents()[2];
 

-            doc.transform('extractItems', {item1: item2, item2: item3});
+            doc.extractItems({item1: item2, item2: item3});

 
             var section = doc.root,
                 oldItem1 = section.contents()[1],
 
             var section = doc.root,
                 oldItem1 = section.contents()[1],


@@ -199,7 +201,7 @@ describe.only('Lists extension', function() {
                 item1 = list.contents()[0],
                 item2 = list.contents()[1];
 
                 item1 = list.contents()[0],
                 item2 = list.contents()[1];
 

-            doc.transform('extractItems', {item1: item1, item2: item2});
+            doc.extractItems({item1: item1, item2: item2});

 
             var section = doc.root,
                 oldItem1 = section.contents()[0],
 
             var section = doc.root,
                 oldItem1 = section.contents()[0],


@@ -229,7 +231,7 @@ describe.only('Lists extension', function() {
                 nestedList = list.contents()[1].contents()[0],
                 nestedListItem = nestedList.contents()[1];
 
                 nestedList = list.contents()[1].contents()[0],
                 nestedListItem = nestedList.contents()[1];
 

-            doc.transform('extractItems', {item1: nestedListItem, item2: nestedListItem});
+            doc.extractItems({item1: nestedListItem, item2: nestedListItem}); //@@ name!

 
             var section = doc.root,
                 list = section.contents()[0],
 
             var section = doc.root,
                 list = section.contents()[0],


@@ -278,7 +280,7 @@ describe.only('Lists extension', function() {
                 nestedListItem1 = nestedList.contents()[1],
                 nestedListItem2 = nestedList.contents()[2];
 
                 nestedListItem1 = nestedList.contents()[1],
                 nestedListItem2 = nestedList.contents()[2];
 

-            doc.transform('extractItems', {item1: nestedListItem1, item2: nestedListItem2});
+            doc.extractItems({item1: nestedListItem1, item2: nestedListItem2});

 
             var section = doc.root,
                 list = section.contents()[0],
 
             var section = doc.root,
                 list = section.contents()[0],


@@ -319,7 +321,7 @@ describe.only('Lists extension', function() {
                 nestedListItem1 = nestedList.contents()[0],
                 nestedListItem2 = nestedList.contents()[1];
 
                 nestedListItem1 = nestedList.contents()[0],
                 nestedListItem2 = nestedList.contents()[1];
 

-            doc.transform('extractItems', {item1: nestedListItem1, item2: nestedListItem2});
+            doc.extractItems({item1: nestedListItem1, item2: nestedListItem2});

 
             var section = doc.root,
                 list = section.contents()[0],
 
             var section = doc.root,
                 list = section.contents()[0],


@@ -360,7 +362,7 @@ describe.only('Lists extension', function() {
                 nestedListItem1 = nestedList.contents()[0],
                 nestedListItem2 = nestedList.contents()[1];
 
                 nestedListItem1 = nestedList.contents()[0],
                 nestedListItem2 = nestedList.contents()[1];
 

-            doc.transform('extractItems', {item1: nestedListItem1, item2: nestedListItem2});
+            doc.extractItems({item1: nestedListItem1, item2: nestedListItem2});

 
             var section = doc.root,
                 list = section.contents()[0],
 
             var section = doc.root,
                 list = section.contents()[0],


@@ -395,7 +397,7 @@ describe.only('Lists extension', function() {
                 nestedList = list.contents()[1].contents()[0],
                 nestedListItem = nestedList.contents()[0];
 
                 nestedList = list.contents()[1].contents()[0],
                 nestedListItem = nestedList.contents()[0];
 

-            var test = doc.transform('extractItems', {item1: nestedListItem, item2: nestedListItem, merge: false});
+            var test = doc.extractItems({item1: nestedListItem, item2: nestedListItem, merge: false});

 
             expect(test).to.equal(true, 'extraction status ok');
 
 
             expect(test).to.equal(true, 'extraction status ok');