Merge d21c2ad into af878ff

ariatemplates · Sep 17, 2014 · fbcb3de · fbcb3de
2 parents af878ff + d21c2ad
commit fbcb3de
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/hsp/rt/cptwrapper.js b/hsp/rt/cptwrapper.js
@@ -45,7 +45,7 @@ var ATTRIBUTE_TYPES = {
     "string" : {
         defaultValue : '',
         convert : function (v, attcfg) {
-            return v + '';
+            return v != null? v + '': v;
         }
     },
     "object" : {

diff --git a/test/rt/cptattelements1.spec.hsp b/test/rt/cptattelements1.spec.hsp
@@ -102,7 +102,7 @@ PanelController = klass({
 
 var TestCtl=klass({
       attributes:{
-        "value":{type:"string",binding:"1-way"}
+        "value":{type:"string",binding:"1-way", defaultValue: "abc"}
     }
 })
 
@@ -283,6 +283,27 @@ describe("Component attribute elements (1)", function () {
     h.$dispose();
   });
 
+  it("tests issue #164 - Attributes of type string should contain null when the bound value is null", function() {
+    var h=ht.newTestContext();
+    var m={prop:{value: null}};
+    test7(m).render(h.container);
+
+    expect(h(".content").text()).to.equal("Value:");
+
+    h.$dispose();
+  });
+
+  //TODO: fix this test or remove it if not valid
+  /*it("tests issue #164 - Attributes of type string contain string defaultValue when the bound value is undefined", function() {
+    var h=ht.newTestContext();
+    var m={prop:{}};
+    test7(m).render(h.container);
+
+    expect(h(".content").text()).to.equal("Value:abc");
+
+    h.$dispose();
+  });*/
+
   it("tests invalid component content", function() {
     var h=ht.newTestContext();
     var m={panel:panel,text:"Hello World"}
@@ -296,6 +317,8 @@ describe("Component attribute elements (1)", function () {
     h.$dispose();
   });
 
+
+
   // TODO
   // properly dispose generated properties
   // test errors when sub-template attribute are improperly mixed