X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/575435e1d6c772414286d891fbeb2956cd7f6753..58ba604b1c414d5484d8165c38662050809655aa:/src/wlxml/wlxml.test.js

diff --git a/src/wlxml/wlxml.test.js b/src/wlxml/wlxml.test.js
index 480ca1c..c37b21f 100644
--- a/src/wlxml/wlxml.test.js
+++ b/src/wlxml/wlxml.test.js
@@ -6,7 +6,7 @@ define([
 'use strict';
 
 /* jshint expr:true */
-/* global it, describe */
+/* global it, describe, beforeEach */
 
 var expect = chai.expect;
 
@@ -27,9 +27,14 @@ describe('WLXMLDocument', function() {
             expect(node.getClass()).to.equal('class.subclass');
         });
 
-        it('returns attributes other than class and meta-* as other attributes', function() {
-            var node = nodeFromXML('<span class="uri" meta-attr="val" attr1="val1" attr2="val2"></span>');
-            expect(node.getOtherAttributes()).to.eql({attr1: 'val1', attr2: 'val2'});
+        it('returns unregistered attributes', function() {
+            var testClasses = {
+                    'testClass': {
+                        attrs: {'attr1': {type: 'string'}}
+                    }
+                },
+                doc = getDocumentFromXML('<span class="testClass" attr="val" attr1="val1"></span>', {wlxmlClasses: testClasses});
+            expect(doc.root.getOtherAttributes()).to.eql({attr: {value:'val'}});
         });
     });
 
@@ -76,7 +81,7 @@ describe('WLXMLDocument', function() {
                         }
                     },
                     node = getDocumentFromXML(
-                        '<span class="test" meta-attr1="val1" meta-attr2="2014-01-01"></span>',
+                        '<span class="test" attr1="val1" attr2="2014-01-01"></span>',
                         {wlxmlClasses: testClasses}
                     ).root,
                     attrs = node.getMetaAttributes();
@@ -103,6 +108,8 @@ describe('WLXMLDocument', 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();
@@ -255,75 +262,14 @@ describe('WLXMLDocument', function() {
         var doc, extension, elementNode, textNode, testClassNode;
 
         beforeEach(function() {
-            doc = getDocumentFromXML('<section>Alice<div class="test_class"></div></section>');
+            doc = getDocumentFromXML('<section>Alice<div class="test_class"></div><div class="test_class.a"></div></section>');
             elementNode = doc.root;
             textNode = doc.root.contents()[0];
+            testClassNode = doc.root.contents('.test_class');
             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() {
@@ -342,13 +288,29 @@ describe('WLXMLDocument', function() {
             }}}};
             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');
         });
 
-
+        it('added methods are inherited by nodes with subclasses', function() {
+            extension = {wlxmlClass: {test_class: {methods: {
+                testMethod: function() { return this; }
+            }}}};
+            doc.registerExtension(extension);
+            testClassNode = doc.root.contents()[2];
+            expect(testClassNode.object.testMethod().sameNode(testClassNode)).to.equal(true);
+        });
+        it('added transformations are inherited by nodes with subclasses', function() {
+            extension = {wlxmlClass: {test_class: {transformations: {
+                testTransformation: function() { return this; },
+                testTransformation2: {impl: function() { return this; }}
+            }}}};
+            doc.registerExtension(extension);
+            testClassNode = doc.root.contents()[2];
+            expect(testClassNode.object.testTransformation().sameNode(testClassNode)).to.equal(true, '1');
+            expect(testClassNode.object.testTransformation2().sameNode(testClassNode)).to.equal(true, '2');
+        });
     });
-
 });
 
 });
\ No newline at end of file