Labelformatter set to 'label' no longer crashes when no labels attribute is present on the model. Fixes #73

thedersen · thedersen · commit ca2ec79bd334 · 2012-11-20T22:43:37.000+01:00
diff --git a/src/backbone-validation.js b/src/backbone-validation.js
@@ -373,7 +373,7 @@ Backbone.Validation = (function(_){
     //        }
     //      });
     label: function(attrName, model) {
-      return model.labels[attrName] || defaultLabelFormatters.sentenceCase(attrName, model);
+      return (model.labels && model.labels[attrName]) || defaultLabelFormatters.sentenceCase(attrName, model);
     }
   };
 
diff --git a/tests/labelFormatter.js b/tests/labelFormatter.js
@@ -52,6 +52,21 @@ buster.testCase('Label formatters', {
 
       "returns sentence cased name when label is not found": function(){
         assert.equals('Some attribute is required', this.model.preValidate('some_attribute', ''));
+      },
+
+      "returns sentence cased name when label attribute is not defined": function(){
+        var Model = Backbone.Model.extend({
+          validation: {
+            someAttribute: {
+              required: true
+            }
+          }
+        });
+
+        var model = new Model();
+        _.extend(model, Backbone.Validation.mixin);
+
+        assert.equals('Some attribute is required', model.preValidate('someAttribute', ''));
       }
     },
 

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ Backbone.Validation = (function(_){`
`373`	`373`	`// }`
`374`	`374`	`// });`
`375`	`375`	`label: function(attrName, model) {`
`376`		`- return model.labels[attrName] \|\| defaultLabelFormatters.sentenceCase(attrName, model);`
	`376`	`+ return (model.labels && model.labels[attrName]) \|\| defaultLabelFormatters.sentenceCase(attrName, model);`
`377`	`377`	`}`
`378`	`378`	`};`
`379`	`379`