Merge branch 'master' into 690-fix

Author: jessebeach

README.md

@@ -1,6 +1,6 @@
 <p align="center">
-  <a href="https://travis-ci.org/evcohen/eslint-plugin-jsx-a11y">
-    <img src="https://api.travis-ci.org/evcohen/eslint-plugin-jsx-a11y.svg?branch=master"
+  <a href="https://travis-ci.com/github/jsx-eslint/eslint-plugin-jsx-a11y">
+    <img src="https://travis-ci.com/jsx-eslint/eslint-plugin-jsx-a11y.svg?branch=master"
          alt="build status">
   </a>
   <a href="https://npmjs.org/package/eslint-plugin-jsx-a11y">

__tests__/src/rules/label-has-associated-control-test.js

@@ -48,6 +48,11 @@ const nestingValid = [
   { code: '<label><span><span><span><span>A label</span><input /></span></span></span></label>', options: [{ depth: 5 }] },
   { code: '<label><span><span><span><span aria-label="A label" /><input /></span></span></span></label>', options: [{ depth: 5 }] },
   { code: '<label><span><span><span><input aria-label="A label" /></span></span></span></label>', options: [{ depth: 5 }] },
+  // Other controls
+  { code: '<label>foo<meter /></label>' },
+  { code: '<label>foo<output /></label>' },
+  { code: '<label>foo<progress /></label>' },
+  { code: '<label>foo<textarea /></label>' },
   // Custom controlComponents.
   { code: '<label><span>A label<CustomInput /></span></label>', options: [{ controlComponents: ['CustomInput'] }] },
   { code: '<CustomLabel><span>A label<CustomInput /></span></CustomLabel>', options: [{ controlComponents: ['CustomInput'], labelComponents: ['CustomLabel'] }] },

src/rules/label-has-associated-control.js

@@ -57,7 +57,14 @@ module.exports = {
       if (componentNames.indexOf(elementType(node.openingElement)) === -1) {
         return;
       }
-      const controlComponents = ['input', 'select', 'textarea'].concat((options.controlComponents || []));
+      const controlComponents = [
+        'input',
+        'meter',
+        'output',
+        'progress',
+        'select',
+        'textarea',
+      ].concat((options.controlComponents || []));
       // Prevent crazy recursion.
       const recursionDepth = Math.min(
         options.depth === undefined ? 2 : options.depth,