From ff09f6fedba84b4487497a488c80d4ce6e5571f0 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 2 Feb 2015 15:42:40 -0500
Subject: [PATCH] Bug 1128153.  When a number input contains a non-number
 (possibly empty) value, the validation message should be about the value not
 being a number, not about there being no value.  r=jwatt

---
 dom/html/HTMLInputElement.cpp                 |  3 ++
 .../forms/test_input_number_validation.html   | 37 +++++++++++++++++--
 .../test/forms/test_required_attribute.html   |  6 +++
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
index f6ee411e19e3..cb18f3975858 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -6894,6 +6894,9 @@ HTMLInputElement::GetValidationMessage(nsAString& aValidationMessage,
         case NS_FORM_INPUT_RADIO:
           key.AssignLiteral("FormValidationRadioMissing");
           break;
+        case NS_FORM_INPUT_NUMBER:
+          key.AssignLiteral("FormValidationBadInputNumber");
+          break;
         default:
           key.AssignLiteral("FormValidationValueMissing");
       }
diff --git a/dom/html/test/forms/test_input_number_validation.html b/dom/html/test/forms/test_input_number_validation.html
index 365cf228568f..8b8af2b7f278 100644
--- a/dom/html/test/forms/test_input_number_validation.html
+++ b/dom/html/test/forms/test_input_number_validation.html
@@ -16,6 +16,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=827161
 <p id="display"></p>
 <div id="content">
   <input id="input" type="number" step="0.01" oninvalid="invalidEventHandler(event);">
+  <input id="requiredinput" type="number" step="0.01" required
+         oninvalid="invalidEventHandler(event);">
 </div>
 <pre id="test">
 <script type="application/javascript">
@@ -37,21 +39,22 @@ function runTest(test) {
   elem.lang = test.langTag;
 
   gInvalid = false; // reset
+  var desc = `${test.desc}  (lang='${test.langTag}', id='${elem.id}')`;
   elem.value = 0;
   elem.focus();
   elem.select();
   sendString(test.inputWithGrouping);
-  checkIsValid(elem, test.desc + " ('" + test.langTag + "') with grouping separator");
+  checkIsValid(elem, `${desc} with grouping separator`);
   sendChar("a");
-  checkIsInvalid(elem, test.desc + " ('" + test.langTag + "') with grouping separator");
+  checkIsInvalid(elem, `${desc} with grouping separator`);
 
   gInvalid = false; // reset
   elem.value = 0;
   elem.select();
   sendString(test.inputWithoutGrouping);
-  checkIsValid(elem, test.desc + " ('" + test.langTag + "') without grouping separator");
+  checkIsValid(elem, `${desc} without grouping separator`);
   sendChar("a");
-  checkIsInvalid(elem, test.desc + " ('" + test.langTag + "') without grouping separator");
+  checkIsInvalid(elem, `${desc} without grouping separator`);
 }
 
 function startTests() {
@@ -59,6 +62,14 @@ function startTests() {
   for (var test of tests) {
     runTest(test);
   }
+  elem = document.getElementById("requiredinput");
+  for (var test of tests) {
+    runTest(test);
+  }
+
+  gInvalid = false; // reset
+  elem.value = "";
+  checkIsInvalidEmptyValue(elem, "empty value");
 }
 
 var gInvalid = false;
@@ -85,6 +96,24 @@ function checkIsInvalid(element, infoStr)
 {
   ok(element.validity.badInput,
      "Element should suffer from bad input for " + infoStr);
+  if (element.id == "requiredinput") {
+    ok(element.validity.valueMissing,
+       "Element should suffer from value missing for " + infoStr);
+  }
+  ok(!element.validity.valid, "Element should not be valid for " + infoStr);
+  ok(!element.checkValidity(), "checkValidity() should return false for " + infoStr);
+  ok(gInvalid, "The invalid event should have been thrown for " + infoStr);
+  is(element.validationMessage, "Please enter a number.",
+     "Validation message is not the expected message for " + infoStr);
+  ok(element.matches(":invalid"), ":invalid pseudo-class should apply for " + infoStr);
+}
+
+function checkIsInvalidEmptyValue(element, infoStr)
+{
+  ok(!element.validity.badInput,
+     "Element should not suffer from bad input for " + infoStr);
+  ok(element.validity.valueMissing,
+     "Element should suffer from value missing for " + infoStr);
   ok(!element.validity.valid, "Element should not be valid for " + infoStr);
   ok(!element.checkValidity(), "checkValidity() should return false for " + infoStr);
   ok(gInvalid, "The invalid event should have been thrown for " + infoStr);
diff --git a/dom/html/test/forms/test_required_attribute.html b/dom/html/test/forms/test_required_attribute.html
index 398acf2ce491..e0dbfa44a081 100644
--- a/dom/html/test/forms/test_required_attribute.html
+++ b/dom/html/test/forms/test_required_attribute.html
@@ -66,6 +66,12 @@ function checkSufferingFromBeingMissing(element, hasMozUIInvalid)
       "Please select a file.",
       "Validation message is wrong");
   }
+  else if (element.type == 'number')
+  {
+    is(element.validationMessage,
+      "Please enter a number.",
+      "Validation message is wrong");
+  }
   else // text fields
   {
     is(element.validationMessage,