Merge pull request #286 from ljharb/travis

ljharb · web-flow · commit 775d0d172b0e · 2017-07-07T21:17:20.000-07:00
Improve travis-ci tests
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,31 @@
 language: node_js
 node_js:
-  - 4
-  - 5
-  - 6
+  - "8"
+  - "7"
+  - "6"
+  - "5"
+  - "4"
 cache:
   yarn: true
   directories:
     - node_modules
 script:
-  - npm run test:ci
+  - if [ "${FLOW-}" = true ]; then npm run flow; fi
+  - if [ "${LINT-}" = true ]; then npm run lint; fi
+  - if [ "${TEST-}" = true ]; then npm run test:ci; fi
 after_success:
-  - npm run coveralls
+  - if [ "${TEST-}" = true ]; then npm run coveralls; fi
+sudo: false
+env:
+  global:
+    - TEST=true
+matrix:
+  fast_finish: true
+  include:
+    - node_js: "node"
+      env: FLOW=true TEST=false
+    - node_js: "node"
+      env: LINT=true TEST=false
+  allow_failures:
+    - node_js: "7"
+    - node_js: "5"
diff --git a/__tests__/src/rules/aria-role-test.js b/__tests__/src/rules/aria-role-test.js
@@ -24,10 +24,12 @@ const errorMessage = {
   type: 'JSXAttribute',
 };
 
-const validRoles = [...roles.keys()].filter(
+const roleKeys = [...roles.keys()];
+
+const validRoles = roleKeys.filter(
   role => roles.get(role).abstract === false,
 );
-const invalidRoles = [...roles.keys()].filter(
+const invalidRoles = roleKeys.filter(
   role => roles.get(role).abstract === true,
 );
 
@@ -60,6 +62,8 @@ ruleTester.run('aria-role', rule, {
     { code: '<div role="doc-appendix doc-bibliography" />' },
     { code: '<Bar baz />' },
     { code: '<Foo role="bar" />', options: ignoreNonDOMSchema },
+    { code: '<fakeDOM role="bar" />', options: ignoreNonDOMSchema },
+    { code: '<img role="presentation" />', options: ignoreNonDOMSchema },
   ].concat(validTests).map(parserOptionsMapper),
 
   invalid: [
diff --git a/__tests__/src/rules/aria-unsupported-elements-test.js b/__tests__/src/rules/aria-unsupported-elements-test.js
@@ -44,6 +44,9 @@ const ariaValidityTests = domElements.map((element) => {
   return {
     code: `<${element} ${aria} />`,
   };
+}).concat({
+  code: '<fake aria-hidden />',
+  errors: [errorMessage('aria-hidden')],
 });
 
 // Generate invalid test cases.
@@ -57,7 +60,7 @@ const invalidRoleValidityTests = domElements
 const invalidAriaValidityTests = domElements
   .filter(element => Boolean(dom.get(element).reserved))
   .map(reservedElem => ({
-    code: `<${reservedElem} aria-hidden {...props} />`,
+    code: `<${reservedElem} aria-hidden aria-role="none" {...props} />`,
     errors: [errorMessage('aria-hidden')],
   }));
 
diff --git a/__tests__/src/rules/no-autofocus-test.js b/__tests__/src/rules/no-autofocus-test.js
@@ -36,6 +36,7 @@ ruleTester.run('no-autofocus', rule, {
     { code: '<input autofocus="true" />;' },
     { code: '<Foo bar />' },
     { code: '<Foo autoFocus />', options: ignoreNonDOMSchema },
+    { code: '<div><div autofocus /></div>', options: ignoreNonDOMSchema },
   ].map(parserOptionsMapper),
   invalid: [
     { code: '<div autoFocus />', errors: [expectedError] },
diff --git a/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js b/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
@@ -368,6 +368,7 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
   valid: [
     ...alwaysValid,
     { code: '<tr role="presentation" />;' },
+    { code: '<Component role="presentation" />;' },
   ]
     .map(ruleOptionsMapperFactory(recommendedOptions))
     .map(parserOptionsMapper),
diff --git a/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js b/__tests__/src/rules/no-noninteractive-element-to-interactive-role-test.js
@@ -447,6 +447,7 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
     { code: '<li role="menuitem" />;' },
     { code: '<li role="row" />;' },
     { code: '<li role="treeitem" />;' },
+    { code: '<Component role="treeitem" />;' },
   ]
     .map(ruleOptionsMapperFactory(recommendedOptions))
     .map(parserOptionsMapper),
diff --git a/__tests__/src/util/attributesComparator-test.js b/__tests__/src/util/attributesComparator-test.js
@@ -2,6 +2,7 @@
 import expect from 'expect';
 import attributesComparator from '../../../src/util/attributesComparator';
 import JSXAttributeMock from '../../../__mocks__/JSXAttributeMock';
+import JSXElementMock from '../../../__mocks__/JSXElementMock';
 
 describe('attributesComparator', () => {
   describe('base attributes', () => {
@@ -65,6 +66,7 @@ describe('attributesComparator', () => {
           describe('and the values are the different', () => {
             it('should return false', () => {
               attributes = [
+                JSXElementMock(),
                 JSXAttributeMock('biz', 2),
                 JSXAttributeMock('ziff', 'opo'),
                 JSXAttributeMock('far', 'lolz'),
diff --git a/__tests__/src/util/implicitRoles/input-test.js b/__tests__/src/util/implicitRoles/input-test.js
@@ -0,0 +1,32 @@
+/* eslint-env mocha */
+import expect from 'expect';
+import JSXAttributeMock from '../../../../__mocks__/JSXAttributeMock';
+import getImplicitRoleForInput from '../../../../src/util/implicitRoles/input';
+
+describe('isAbstractRole', () => {
+  it('works for buttons', () => {
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'button')])).toBe('button');
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'image')])).toBe('button');
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'reset')])).toBe('button');
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'submit')])).toBe('button');
+  });
+  it('works for checkboxes', () => {
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'checkbox')])).toBe('checkbox');
+  });
+  it('works for radios', () => {
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'radio')])).toBe('radio');
+  });
+  it('works for ranges', () => {
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'range')])).toBe('slider');
+  });
+  it('works for textboxes', () => {
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'email')])).toBe('textbox');
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'password')])).toBe('textbox');
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'search')])).toBe('textbox');
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'tel')])).toBe('textbox');
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', 'url')])).toBe('textbox');
+  });
+  it('works for the default case', () => {
+    expect(getImplicitRoleForInput([JSXAttributeMock('type', '')])).toBe('textbox');
+  });
+});
diff --git a/__tests__/src/util/implicitRoles/menu-test.js b/__tests__/src/util/implicitRoles/menu-test.js
@@ -0,0 +1,13 @@
+/* eslint-env mocha */
+import expect from 'expect';
+import JSXAttributeMock from '../../../../__mocks__/JSXAttributeMock';
+import getImplicitRoleForMenu from '../../../../src/util/implicitRoles/menu';
+
+describe('isAbstractRole', () => {
+  it('works for toolbars', () => {
+    expect(getImplicitRoleForMenu([JSXAttributeMock('type', 'toolbar')])).toBe('toolbar');
+  });
+  it('works for non-toolbars', () => {
+    expect(getImplicitRoleForMenu([JSXAttributeMock('type', '')])).toBe('');
+  });
+});
diff --git a/__tests__/src/util/implicitRoles/menuitem-test.js b/__tests__/src/util/implicitRoles/menuitem-test.js
@@ -0,0 +1,19 @@
+/* eslint-env mocha */
+import expect from 'expect';
+import JSXAttributeMock from '../../../../__mocks__/JSXAttributeMock';
+import getImplicitRoleForMenuitem from '../../../../src/util/implicitRoles/menuitem';
+
+describe('isAbstractRole', () => {
+  it('works for menu items', () => {
+    expect(getImplicitRoleForMenuitem([JSXAttributeMock('type', 'command')])).toBe('menuitem');
+  });
+  it('works for menu item checkboxes', () => {
+    expect(getImplicitRoleForMenuitem([JSXAttributeMock('type', 'checkbox')])).toBe('menuitemcheckbox');
+  });
+  it('works for menu item radios', () => {
+    expect(getImplicitRoleForMenuitem([JSXAttributeMock('type', 'radio')])).toBe('menuitemradio');
+  });
+  it('works for non-toolbars', () => {
+    expect(getImplicitRoleForMenuitem([JSXAttributeMock('type', '')])).toBe('');
+  });
+});
diff --git a/__tests__/src/util/isInteractiveElement-test.js b/__tests__/src/util/isInteractiveElement-test.js
@@ -2,6 +2,7 @@
 import expect from 'expect';
 import { elementType } from 'jsx-ast-utils';
 import isInteractiveElement from '../../../src/util/isInteractiveElement';
+import JSXElementMock from '../../../__mocks__/JSXElementMock';
 import {
   genElementSymbol,
   genIndeterminantInteractiveElements,
@@ -78,4 +79,9 @@ describe('isInteractiveElement', () => {
       },
     );
   });
+  describe('JSX elements', () => {
+    it('is not interactive', () => {
+      expect(isInteractiveElement('CustomComponent', JSXElementMock())).toBe(false);
+    });
+  });
 });
diff --git a/__tests__/src/util/schemas-test.js b/__tests__/src/util/schemas-test.js
@@ -1,6 +1,6 @@
 /* eslint-env jest */
 import assert from 'assert';
-import { generateObjSchema, arraySchema } from '../../../src/util/schemas';
+import { generateObjSchema, arraySchema, enumArraySchema } from '../../../src/util/schemas';
 
 describe('schemas', () => {
   it('should generate an object schema with correct properties', () => {
@@ -13,4 +13,18 @@ describe('schemas', () => {
     assert.deepEqual(properties.foo, 'bar');
     assert.deepEqual(properties.baz.type, 'array');
   });
+  describe('enumArraySchema', () => {
+    it('works with no arguments', () => {
+      assert.deepEqual(enumArraySchema(), {
+        additionalItems: false,
+        items: {
+          enum: [],
+          type: 'string',
+        },
+        minItems: 0,
+        type: 'array',
+        uniqueItems: true,
+      });
+    });
+  });
 });
diff --git a/package.json b/package.json
@@ -23,10 +23,11 @@
     "flow": "if [ ! -e ./.flowconfig ]; then echo \"Could not find .flowconfig\"; else flow; test $? -eq 0 -o $? -eq 2; fi",
     "lint:fix": "npm run lint -- --fix",
     "lint": "eslint  --config .eslintrc src __tests__ __mocks__ scripts",
-    "prepublish": "safe-publish-latest && npm run lint && npm run flow && npm run test && npm run build",
+    "prepublish": "safe-publish-latest && not-in-publish || (npm run lint && npm run flow && npm run jest && npm run build)",
     "pretest": "npm run lint:fix && npm run flow",
-    "test:ci": "npm test -- --ci --runInBand",
-    "test": "jest --coverage __tests__/**/*"
+    "test": "npm run jest",
+    "test:ci": "npm run jest -- --ci --runInBand",
+    "jest": "jest --coverage __tests__/**/*"
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
@@ -45,6 +46,7 @@
     "eslint-plugin-import": "^2.3.0",
     "expect": "^1.20.2",
     "flow-bin": "^0.49.1",
+    "in-publish": "^2.0.0",
     "jest": "^20.0.4",
     "jscodeshift": "^0.3.30",
     "minimist": "^1.2.0",
@@ -64,14 +66,15 @@
     "axobject-query": "^0.1.0",
     "damerau-levenshtein": "^1.0.0",
     "emoji-regex": "^6.1.0",
-    "jsx-ast-utils": "^1.4.0"
+    "jsx-ast-utils": "^2.0.0"
   },
   "peerDependencies": {
     "eslint": "^3 || ^4"
   },
   "jest": {
     "coverageReporters": [
-      "lcov"
+      "lcov",
+      "html"
     ],
     "coverageDirectory": "reports",
     "roots": [
diff --git a/src/rules/aria-props.js b/src/rules/aria-props.js
@@ -36,7 +36,7 @@ module.exports = {
   create: context => ({
     JSXAttribute: (attribute) => {
       const name = propName(attribute);
-      const normalizedName = name ? name.toLowerCase() : '';
+      const normalizedName = name.toLowerCase();
 
       // `aria` needs to be prefix of property.
       if (normalizedName.indexOf('aria-') !== 0) {
diff --git a/src/rules/aria-proptypes.js b/src/rules/aria-proptypes.js
@@ -63,7 +63,7 @@ module.exports = {
   create: context => ({
     JSXAttribute: (attribute) => {
       const name = propName(attribute);
-      const normalizedName = name ? name.toLowerCase() : '';
+      const normalizedName = name.toLowerCase();
 
       // Not a valid aria-* state or property.
       if (normalizedName.indexOf('aria-') !== 0 || aria.get(normalizedName) === undefined) {
diff --git a/src/rules/aria-role.js b/src/rules/aria-role.js
@@ -41,10 +41,9 @@ module.exports = {
       }
 
       // Get prop name
-      const name = propName(attribute);
-      const normalizedName = name ? name.toUpperCase() : '';
+      const name = propName(attribute).toUpperCase();
 
-      if (normalizedName !== 'ROLE') { return; }
+      if (name !== 'ROLE') { return; }
 
       const value = getLiteralPropValue(attribute);
 
diff --git a/src/rules/aria-unsupported-elements.js b/src/rules/aria-unsupported-elements.js
@@ -47,10 +47,9 @@ module.exports = {
           return;
         }
 
-        const name = propName(prop);
-        const normalizedName = name ? name.toLowerCase() : '';
+        const name = propName(prop).toLowerCase();
 
-        if (invalidAttributes.indexOf(normalizedName) > -1) {
+        if (invalidAttributes.indexOf(name) > -1) {
           context.report({
             node,
             message: errorMessage(name),
diff --git a/src/rules/mouse-events-have-key-events.js b/src/rules/mouse-events-have-key-events.js
@@ -30,7 +30,7 @@ module.exports = {
       const onMouseOver = getProp(attributes, 'onMouseOver');
       const onMouseOverValue = getPropValue(onMouseOver);
 
-      if (onMouseOver && (onMouseOverValue !== null || onMouseOverValue !== undefined)) {
+      if (onMouseOver && onMouseOverValue != null) {
         const hasOnFocus = getProp(attributes, 'onFocus');
         const onFocusValue = getPropValue(hasOnFocus);
 
@@ -45,7 +45,7 @@ module.exports = {
       // Checkout onmouseout / onblur pairing
       const onMouseOut = getProp(attributes, 'onMouseOut');
       const onMouseOutValue = getPropValue(onMouseOut);
-      if (onMouseOut && (onMouseOutValue !== null || onMouseOutValue !== undefined)) {
+      if (onMouseOut && onMouseOutValue != null) {
         const hasOnBlur = getProp(attributes, 'onBlur');
         const onBlurValue = getPropValue(hasOnBlur);
 
diff --git a/src/rules/role-has-required-aria-props.js b/src/rules/role-has-required-aria-props.js
@@ -26,10 +26,9 @@ module.exports = {
 
   create: context => ({
     JSXAttribute: (attribute) => {
-      const name = propName(attribute);
-      const normalizedName = name ? name.toLowerCase() : '';
+      const name = propName(attribute).toLowerCase();
 
-      if (normalizedName !== 'role') {
+      if (name !== 'role') {
         return;
       }
 
diff --git a/src/rules/tabindex-no-positive.js b/src/rules/tabindex-no-positive.js
@@ -22,11 +22,10 @@ module.exports = {
 
   create: context => ({
     JSXAttribute: (attribute) => {
-      const name = propName(attribute);
-      const normalizedName = name ? name.toUpperCase() : '';
+      const name = propName(attribute).toUpperCase();
 
       // Check if tabIndex is the attribute
-      if (normalizedName !== 'TABINDEX') {
+      if (name !== 'TABINDEX') {
         return;
       }
 
diff --git a/src/util/isInteractiveElement.js b/src/util/isInteractiveElement.js
@@ -14,6 +14,7 @@ import {
 import includes from 'array-includes';
 import attributesComparator from './attributesComparator';
 
+const domKeys = [...dom.keys()];
 const roleKeys = [...roles.keys()];
 const elementRoleEntries = [...elementRoles];
 
@@ -145,7 +146,7 @@ const isInteractiveElement = (
 ): boolean => {
   // Do not test higher level JSX components, as we do not know what
   // low-level DOM element this maps to.
-  if (!dom.keys(tagName)) {
+  if (!includes(domKeys, tagName)) {
     return false;
   }
 

Original file line number	Diff line number	Diff line change
@@ -368,6 +368,7 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
`368`	`368`	`valid: [`
`369`	`369`	`...alwaysValid,`
`370`	`370`	`{ code: '<tr role="presentation" />;' },`
	`371`	`+ { code: '<Component role="presentation" />;' },`
`371`	`372`	`]`
`372`	`373`	`.map(ruleOptionsMapperFactory(recommendedOptions))`
`373`	`374`	`.map(parserOptionsMapper),`
Original file line number	Diff line number	Diff line change
@@ -447,6 +447,7 @@ ruleTester.run(`${ruleName}:recommended`, rule, {
`447`	`447`	`{ code: '<li role="menuitem" />;' },`
`448`	`448`	`{ code: '<li role="row" />;' },`
`449`	`449`	`{ code: '<li role="treeitem" />;' },`
	`450`	`+ { code: '<Component role="treeitem" />;' },`
`450`	`451`	`]`
`451`	`452`	`.map(ruleOptionsMapperFactory(recommendedOptions))`
`452`	`453`	`.map(parserOptionsMapper),`