cleanup

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

diff --git a/src/wlxml/wlxml.test.js b/src/wlxml/wlxml.test.js
index 480ca1c..9f846f6 100644 (file)
--- a/src/wlxml/wlxml.test.js
+++ b/src/wlxml/wlxml.test.js
@@ -6,7 +6,7 @@ define([
 'use strict';
 
 /* jshint expr:true */
 'use strict';
 
 /* jshint expr:true */

-/* global it, describe */
+/* global it, describe, beforeEach */

 
 var expect = chai.expect;
 
 
 var expect = chai.expect;
 


@@ -103,6 +103,8 @@ describe('WLXMLDocument', function() {
     });
 
     describe('White space handling', function() {
     });
 
     describe('White space handling', function() {

+        /* globals Node */
+

         it('ignores white space surrounding block elements', function() {
             var node = nodeFromXML('<section> <div></div> </section>'),
                 contents = node.contents();
         it('ignores white space surrounding block elements', function() {
             var node = nodeFromXML('<section> <div></div> </section>'),
                 contents = node.contents();


@@ -258,72 +260,11 @@ describe('WLXMLDocument', function() {
             doc = getDocumentFromXML('<section>Alice<div class="test_class"></div></section>');
             elementNode = doc.root;
             textNode = doc.root.contents()[0];
             doc = getDocumentFromXML('<section>Alice<div class="test_class"></div></section>');
             elementNode = doc.root;
             textNode = doc.root.contents()[0];

+            testClassNode = doc.root.contents('.test_class');

             extension = {};
             
             extension = {};
             

-            console.log('A');
-            expect(function() {
-                elementNode.transform('testTransformation');
-            }).to.throw(Error);
-            console.log('B');
-            expect(function() {
-                textNode.transform('testTransformation');
-            }).to.throw(Error);
-            console.log('C');
-            expect(function() {
-                doc.transform('testTransformation');
-            }).to.throw(Error);
-            expect(doc.testMethod).to.be.undefined;
-            expect(elementNode.testMethod).to.be.undefined;
-            expect(textNode.testMethod).to.be.undefined;
-        });
-
-        it('allows adding method to a document', function() {
-            extension = {document: {methods: {
-                testMethod: function() { return this; }
-            }}};
-
-            doc.registerExtension(extension);
-            expect(doc.testMethod()).to.equal(doc, 'context is set to a document instance');
-        });
-
-        it('allows adding transformation to a document', function() {
-            extension = {document: {transformations: {
-                testTransformation: function() { return this; },
-                testTransformation2: {impl: function() { return this;}}
-            }}};
-
-            doc.registerExtension(extension);
-            expect(doc.transform('testTransformation')).to.equal(doc, 'context is set to a document instance');
-            expect(doc.transform('testTransformation2')).to.equal(doc, 'context is set to a document instance');
-        });
-
-        it('allows adding method to a DocumentNode instance', function() {
-            extension = {documentNode: {methods: {
-                testMethod: function() { return this; }    
-            }}};
-
-            doc.registerExtension(extension);
-
-            /* refresh */
-            elementNode = doc.root;
-            textNode = doc.root.contents()[0];
-
-            expect(elementNode.testMethod().sameNode(elementNode)).to.equal(true, 'context is set to a node instance');
-            expect(textNode.testMethod().sameNode(textNode)).to.equal(true, 'context is set to a node instance');
-        });
-
-        it('allows adding transformation to a DocumentNode', function() {
-            extension = {documentNode: {transformations: {
-                testTransformation: function() { return this; },
-                testTransformation2: {impl: function() { return this;}}
-            }}};
-            
-            doc.registerExtension(extension);
+            expect(testClassNode.object).to.be.undefined;

 
 

-            expect(elementNode.transform('testTransformation').sameNode(elementNode)).to.equal(true, '1');
-            expect(elementNode.transform('testTransformation2').sameNode(elementNode)).to.equal(true, '2');
-            expect(textNode.transform('testTransformation').sameNode(textNode)).to.equal(true, '3');
-            expect(textNode.transform('testTransformation2').sameNode(textNode)).to.equal(true, '4');

         });
 
         it('allows adding method to an ElementNode of specific class', function() {
         });
 
         it('allows adding method to an ElementNode of specific class', function() {


@@ -342,8 +283,8 @@ describe('WLXMLDocument', function() {
             }}}};
             doc.registerExtension(extension);
             testClassNode = doc.root.contents()[1];
             }}}};
             doc.registerExtension(extension);
             testClassNode = doc.root.contents()[1];

-            expect(testClassNode.object.transform('testTransformation').sameNode(testClassNode)).to.equal(true, '1');
-            expect(testClassNode.object.transform('testTransformation2').sameNode(testClassNode)).to.equal(true, '1');
+            expect(testClassNode.object.testTransformation().sameNode(testClassNode)).to.equal(true, '1');
+            expect(testClassNode.object.testTransformation2().sameNode(testClassNode)).to.equal(true, '1');

         });
 
 
         });