render label correctly if a custom id is specified

tdryer · Jan 25, 2011 · 61dd58b · 61dd58b
1 parent 9711995
commit 61dd58b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/render.js b/lib/render.js
@@ -15,7 +15,7 @@ var wrapWith = function(tag){
         }
         else {
             html += field.errorHTML() +
-                field.labelHTML(name) +
+                field.labelHTML(name, field.id) +
                 field.widget.toHTML(name, field);
         }
         return html + '</' + tag + '>';

diff --git a/test/test-render.js b/test/test-render.js
@@ -108,6 +108,21 @@ var testWrap = function(tag){
         test.done();
     };
 
+    exports[tag + ' label custom id'] = function(test){
+        var f = forms.create({
+            fieldname: forms.fields.string({
+                id: 'custom-id'
+            })
+        });
+        test.equals(
+            f.toHTML(forms.render[tag]),
+            '<' + tag + ' class="field">' +
+                '<label for="custom-id">Fieldname</label>' +
+                '<input type="text" name="fieldname" id="custom-id" />' +
+            '</' + tag + '>'
+        );
+        test.done();
+    };
 };
 
 testWrap('div');