From 2575b57103870827af2eb1fef5aaacd3cd93a8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Galfas=C3=B3?= <lgalfaso@gmail.com>
Date: Mon, 19 Aug 2013 14:10:24 -0300
Subject: [PATCH] fix(required): `false` is a valid model value when not a
 checkbox

Make the `required` directive accept the model value `false` when it is
not an <input> element or when the <input> element is not a checkbox

Closes #3490 #2594
---
 src/ng/directive/input.js       |  5 +++--
 test/ng/directive/inputSpec.js  | 20 +++++++++++++++++++-
 test/ng/directive/selectSpec.js | 24 ++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js
index 6f3919dfb174..ca6a16a60d5d 100644
--- a/src/ng/directive/input.js
+++ b/src/ng/directive/input.js
@@ -1228,14 +1228,15 @@ var requiredDirective = function() {
       attr.required = true; // force truthy in case we are on non input element
 
       var validator = function(value) {
-        if (attr.required && (isEmpty(value) || value === false)) {
+        if (attr.required && (isEmpty(value) || !acceptFalse && value === false)) {
           ctrl.$setValidity('required', false);
           return;
         } else {
           ctrl.$setValidity('required', true);
           return value;
         }
-      };
+      },
+        acceptFalse = nodeName_(elm).toLowerCase() !== 'input' || attr.type !== 'checkbox';
 
       ctrl.$formatters.push(validator);
       ctrl.$parsers.unshift(validator);
diff --git a/test/ng/directive/inputSpec.js b/test/ng/directive/inputSpec.js
index facc2b806bc9..fc861be0ac37 100644
--- a/test/ng/directive/inputSpec.js
+++ b/test/ng/directive/inputSpec.js
@@ -1093,7 +1093,25 @@ describe('input', function() {
       compileInput('<input type="text" ng-model="notDefiend" required />');
       scope.$digest();
       expect(inputElm).toBeInvalid();
-    })
+    });
+
+    it('should allow `false` as a valid value when the input type is not "checkbox"', function() {
+      compileInput('<input type="radio" ng-value="true" ng-model="answer" required />' +
+        '<input type="radio" ng-value="false" ng-model="answer" required />');
+
+      scope.$apply();
+      expect(inputElm).toBeInvalid();
+
+      scope.$apply(function() {
+        scope.answer = true;
+      });
+      expect(inputElm).toBeValid();
+
+      scope.$apply(function() {
+        scope.answer = false;
+      });
+      expect(inputElm).toBeValid();
+    });
   });
 
 
diff --git a/test/ng/directive/selectSpec.js b/test/ng/directive/selectSpec.js
index 5906ce99b38c..75d1d1e609aa 100644
--- a/test/ng/directive/selectSpec.js
+++ b/test/ng/directive/selectSpec.js
@@ -1198,6 +1198,30 @@ describe('select', function() {
         });
         expect(element).toBeValid();
       });
+
+      it('should allow falsy values as values', function() {
+        createSelect({
+          'ng-model': 'value',
+          'ng-options': 'item.value as item.name for item in values',
+          'ng-required': 'required'
+        }, true);
+
+        scope.$apply(function() {
+          scope.values = [{name: 'True', value: true}, {name: 'False', value: false}];
+          scope.required = false;
+        });
+
+        element.val('1');
+        browserTrigger(element, 'change');
+        expect(element).toBeValid();
+        expect(scope.value).toBe(false);
+
+        scope.$apply(function() {
+          scope.required = true;
+        });
+        expect(element).toBeValid();
+        expect(scope.value).toBe(false);
+      });
     });
   });