From 0e0063c1f8798f47068252537f9e08d3b00f47e5 Mon Sep 17 00:00:00 2001
From: Jey <jey.nandakumar@gmail.com>
Date: Tue, 13 Nov 2018 10:49:37 +0000
Subject: [PATCH] feat: separate form-field-multiple-label from label rule
 (#1226)

---
 doc/rule-descriptions.md                      |  3 +-
 lib/checks/label/multiple-label.json          |  6 +-
 lib/rules/form-field-multiple-labels.json     | 19 ++++
 lib/rules/label.json                          |  1 -
 test/integration/rules/label/label.html       |  3 +-
 test/integration/rules/label/label.json       |  1 -
 .../rules/multiple-label/multiple-label.html  | 86 +++++++++++++++++++
 .../rules/multiple-label/multiple-label.json  | 22 +++++
 8 files changed, 133 insertions(+), 8 deletions(-)
 create mode 100644 lib/rules/form-field-multiple-labels.json
 create mode 100644 test/integration/rules/multiple-label/multiple-label.html
 create mode 100644 test/integration/rules/multiple-label/multiple-label.json

diff --git a/doc/rule-descriptions.md b/doc/rule-descriptions.md
index 25aa0af0f3..c2c4653255 100644
--- a/doc/rule-descriptions.md
+++ b/doc/rule-descriptions.md
@@ -28,6 +28,7 @@
 | duplicate-id | Ensures every id attribute value is unique | Minor | cat.parsing, wcag2a, wcag411 | true |
 | empty-heading | Ensures headings have discernible text | Minor | cat.name-role-value, best-practice | true |
 | focus-order-semantics | Ensures elements in the focus order have an appropriate role | Minor | cat.keyboard, best-practice, experimental | true |
+| form-field-multiple-labels | Ensures form field does not have multiple label elements | Moderate | cat.forms, wcag2a, wcag332 | true |
 | frame-tested | Ensures &lt;iframe&gt; and &lt;frame&gt; elements contain the axe-core script | Critical | cat.structure, review-item | true |
 | frame-title-unique | Ensures &lt;iframe&gt; and &lt;frame&gt; elements contain a unique title attribute | Serious | cat.text-alternatives, best-practice | true |
 | frame-title | Ensures &lt;iframe&gt; and &lt;frame&gt; elements contain a non-empty title attribute | Serious | cat.text-alternatives, wcag2a, wcag241, wcag412, section508, section508.22.i | true |
@@ -40,7 +41,7 @@
 | image-redundant-alt | Ensure button and link text is not repeated as image alternative | Minor | cat.text-alternatives, best-practice | true |
 | input-image-alt | Ensures &lt;input type=&quot;image&quot;&gt; elements have alternate text | Critical | cat.text-alternatives, wcag2a, wcag111, section508, section508.22.a | true |
 | label-title-only | Ensures that every form element is not solely labeled using the title or aria-describedby attributes | Serious | cat.forms, best-practice | true |
-| label | Ensures every form element has a label | Minor, Serious, Critical | cat.forms, wcag2a, wcag332, wcag131, section508, section508.22.n | true |
+| label | Ensures every form element has a label | Minor, Critical | cat.forms, wcag2a, wcag332, wcag131, section508, section508.22.n | true |
 | landmark-banner-is-top-level | Ensures the banner landmark is at top level | Moderate | cat.semantics, best-practice | true |
 | landmark-contentinfo-is-top-level | Ensures the contentinfo landmark is at top level | Moderate | cat.semantics, best-practice | true |
 | landmark-main-is-top-level | Ensures the main landmark is at top level | Moderate | cat.semantics, best-practice | true |
diff --git a/lib/checks/label/multiple-label.json b/lib/checks/label/multiple-label.json
index 9ec5f3c07f..9aca78d646 100644
--- a/lib/checks/label/multiple-label.json
+++ b/lib/checks/label/multiple-label.json
@@ -2,10 +2,10 @@
   "id": "multiple-label",
   "evaluate": "multiple-label.js",
   "metadata": {
-    "impact": "serious",
+    "impact": "moderate",
     "messages": {
-      "pass": "Form element does not have multiple <label> elements",
-      "fail": "Form element has multiple <label> elements"
+      "pass": "Form field does not have multiple label elements",
+      "fail": "Multiple label elements is not widely supported in assistive technologies"
     }
   }
 }
diff --git a/lib/rules/form-field-multiple-labels.json b/lib/rules/form-field-multiple-labels.json
new file mode 100644
index 0000000000..135ac44082
--- /dev/null
+++ b/lib/rules/form-field-multiple-labels.json
@@ -0,0 +1,19 @@
+{
+  "id": "form-field-multiple-labels",
+  "selector": "input, select, textarea",
+  "matches": "label-matches.js",
+  "tags": [
+    "cat.forms",
+    "wcag2a",
+    "wcag332"
+  ],
+  "metadata": {
+    "description": "Ensures form field does not have multiple label elements",
+    "help": "Form field must not have multiple label elements"
+  },
+  "all": [],
+  "any": [],
+  "none": [
+    "multiple-label"
+  ]
+}
diff --git a/lib/rules/label.json b/lib/rules/label.json
index af1747f790..2dd754506b 100644
--- a/lib/rules/label.json
+++ b/lib/rules/label.json
@@ -24,7 +24,6 @@
   ],
   "none": [
     "help-same-as-label",
-    "multiple-label",
     "hidden-explicit-label"
   ]
 }
diff --git a/test/integration/rules/label/label.html b/test/integration/rules/label/label.html
index 72cdda7ab9..6881ba4d43 100644
--- a/test/integration/rules/label/label.html
+++ b/test/integration/rules/label/label.html
@@ -37,7 +37,6 @@
 	<textarea id="pass15" title="Label"></textarea>
 
 	<label><label><input type="text" id="fail22"></label></label>
-	<label for="fail23">Hi</label><label for="fail23">Foo</label><input type="text" id="fail23">
 
 	<div>
 		<label>
@@ -68,4 +67,4 @@
 	</div>
 
 	</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/test/integration/rules/label/label.json b/test/integration/rules/label/label.json
index 78c1067532..2d38b809f8 100644
--- a/test/integration/rules/label/label.json
+++ b/test/integration/rules/label/label.json
@@ -14,7 +14,6 @@
 		["#fail10"],
 		["#fail11"],
 		["#fail22"],
-		["#fail23"],
 		["#fail24"],
 		["#fail25"],
 		["#fail26"]
diff --git a/test/integration/rules/multiple-label/multiple-label.html b/test/integration/rules/multiple-label/multiple-label.html
new file mode 100644
index 0000000000..ad13ba3479
--- /dev/null
+++ b/test/integration/rules/multiple-label/multiple-label.html
@@ -0,0 +1,86 @@
+<!-- Fail -->
+<label for="fail1">Hi</label>
+<label for="fail1">Foo</label>
+<input type="text" id="fail1">
+
+<label for="fail2">label one</label>
+<label for="fail2">label two</label>
+<input type="checkbox" id="fail2">
+
+<label for="fail3" id="l1">label one</label>
+<label for="fail3">label two</label>
+<input type="checkbox" id="fail3" aria-labelledby="l1">
+
+<label for="fail4">First Name:</label>
+<label>First Name:
+	<input type="text" id="fail4">
+</label>
+
+<label for="fail5">Choose an option:</label>
+<label>
+	Choose an option:
+	<select id="fail5">
+			<option selected="selected">Chosen</option>
+			<option>Not Selected</option>
+	</select>
+</label>
+
+<label for="fail6">Enter your comments:</label>
+<label>
+	Enter your comments:
+	<textarea id="fail6"></textarea>
+</label>
+
+<label>
+	Enter your comments:
+	<label>
+		Enter your comments:
+		<textarea id="fail7"></textarea>
+	</label>
+</label>
+
+<label>
+	Enter your comments:
+	<label>
+		Enter your comments:
+		<label>
+			Enter your comments:
+			<textarea id="fail8"></textarea>
+		</label>
+	</label>
+</label>
+
+<label for="fail9">Enter your comments:</label>
+<label>
+	Enter your comments:
+	<label>
+		Enter your comments:
+		<label>
+			Enter your comments:
+			<textarea id="fail9"></textarea>
+		</label>
+	</label>
+</label>
+
+<!-- Pass -->
+<label for="pass1">Label</label>
+<input type="text" id="pass1">
+
+<textarea id="pass2" title="Label"></textarea>
+
+<label>First Name:
+	<input type="text" id="pass3">
+</label>
+
+<label>
+	Choose an option:
+	<select id="pass4">
+			<option selected="selected">Chosen</option>
+			<option>Not Selected</option>
+	</select>
+</label>
+
+<label>
+	Enter your comments:
+	<textarea id="pass5"></textarea>
+</label>
diff --git a/test/integration/rules/multiple-label/multiple-label.json b/test/integration/rules/multiple-label/multiple-label.json
new file mode 100644
index 0000000000..8e6169c804
--- /dev/null
+++ b/test/integration/rules/multiple-label/multiple-label.json
@@ -0,0 +1,22 @@
+{
+	"description": "form-field-multiple-labels label test",
+	"rule": "form-field-multiple-labels",
+	"violations": [
+    ["#fail1"],
+    ["#fail2"],
+    ["#fail3"],
+    ["#fail4"],
+    ["#fail5"],
+    ["#fail6"],
+    ["#fail7"],
+    ["#fail8"],
+    ["#fail9"]
+	],
+	"passes": [
+    ["#pass1"],
+    ["#pass2"],
+    ["#pass3"],
+    ["#pass4"],
+    ["#pass5"]
+  ]
+}