editor: cleanup

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

diff --git a/src/wlxml/wlxml.test.js b/src/wlxml/wlxml.test.js
index bb5101f..18a7332 100644 (file)
--- a/src/wlxml/wlxml.test.js
+++ b/src/wlxml/wlxml.test.js
@@ -1,12 +1,13 @@
 define([
 define([

+    'libs/jquery',

     'libs/chai',
     './wlxml.js'
     'libs/chai',
     './wlxml.js'

-], function(chai, wlxml) {
+], function($, chai, wlxml) {

     
 '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;
 


@@ -27,9 +28,14 @@ describe('WLXMLDocument', function() {
             expect(node.getClass()).to.equal('class.subclass');
         });
 
             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 +82,7 @@ describe('WLXMLDocument', function() {
                         }
                     },
                     node = getDocumentFromXML(
                         }
                     },
                     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();
                         {wlxmlClasses: testClasses}
                     ).root,
                     attrs = node.getMetaAttributes();


@@ -103,6 +109,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,10 +266,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 = {};
             

+            expect(testClassNode.object).to.be.undefined;

 
 

-            // spr+ a expect dotyczacy object api?

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


@@ -280,13 +289,10 @@ 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');

         });
         });

-
-

     });
     });

-

 });
 
 });
\ No newline at end of file
 });
 
 });
\ No newline at end of file