[Dev Deps] update eslint, eslint-config-airbnb, `eslint-plugin-re…

…act`
enzymejs · Jan 8, 2016 · 5498604 · 5498604
1 parent 8e96af6
commit 5498604
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 133 deletions.
diff --git a/package.json b/package.json
@@ -56,9 +56,9 @@
     "babel-eslint": "^4.1.4",
     "chai": "^3.2.0",
     "coveralls": "^2.11.4",
-    "eslint": "^1.9.0",
-    "eslint-config-airbnb": "^0.1.0",
-    "eslint-plugin-react": "^3.8.0",
+    "eslint": "^1.10.3",
+    "eslint-config-airbnb": "^3.0.2",
+    "eslint-plugin-react": "^3.14.0",
     "gitbook-cli": "^1.0.0",
     "istanbul": "^0.4.0",
     "mocha": "^2.2.5",

diff --git a/src/Debug.js b/src/Debug.js
@@ -22,17 +22,17 @@ export function indent(depth, string) {
 
 function propString(prop) {
   switch (typeof prop) {
-  case 'function':
-    return '{[Function]}';
-  case 'string':
-    return `"${prop}"`;
-  case 'number':
-  case 'boolean':
-    return `{${prop}}`;
-  case 'object':
-    return `{{...}}`;
-  default:
-    return `{[${typeof prop}]}`;
+    case 'function':
+      return '{[Function]}';
+    case 'string':
+      return `"${prop}"`;
+    case 'number':
+    case 'boolean':
+      return `{${prop}}`;
+    case 'object':
+      return `{{...}}`;
+    default:
+      return `{[${typeof prop}]}`;
   }
 }
 

diff --git a/src/MountedTraversal.js b/src/MountedTraversal.js
@@ -55,13 +55,13 @@ export function instHasId(inst, id) {
 
 export function instHasType(inst, type) {
   switch (typeof type) {
-  case 'string':
-    return isDOMComponent(inst) &&
-      inst.tagName.toUpperCase() === type.toUpperCase();
-  case 'function':
-    return isCompositeComponentWithType(inst, type);
-  default:
-    return false;
+    case 'string':
+      return isDOMComponent(inst) &&
+        inst.tagName.toUpperCase() === type.toUpperCase();
+    case 'function':
+      return isCompositeComponentWithType(inst, type);
+    default:
+      return false;
   }
 }
 
@@ -155,29 +155,29 @@ export function parentsOfInst(inst, root) {
 
 export function buildInstPredicate(selector) {
   switch (typeof selector) {
-  case 'function':
-    // selector is a component constructor
-    return inst => instHasType(inst, selector);
+    case 'function':
+      // selector is a component constructor
+      return inst => instHasType(inst, selector);
 
-  case 'string':
-    if (!isSimpleSelector(selector)) {
-      throw selectorError(selector);
-    }
-    if (isCompoundSelector.test(selector)) {
-      return AND(splitSelector(selector).map(buildInstPredicate));
-    }
-    if (selector[0] === '.') {
-      // selector is a class name
-      return inst => instHasClassName(inst, selector.substr(1));
-    } else if (selector[0] === '#') {
-      // selector is an id name
-      return inst => instHasId(inst, selector.substr(1));
-    }
-    // selector is a string. match to DOM tag or constructor displayName
-    return inst => instHasType(inst, selector);
+    case 'string':
+      if (!isSimpleSelector(selector)) {
+        throw selectorError(selector);
+      }
+      if (isCompoundSelector.test(selector)) {
+        return AND(splitSelector(selector).map(buildInstPredicate));
+      }
+      if (selector[0] === '.') {
+        // selector is a class name
+        return inst => instHasClassName(inst, selector.substr(1));
+      } else if (selector[0] === '#') {
+        // selector is an id name
+        return inst => instHasId(inst, selector.substr(1));
+      }
+      // selector is a string. match to DOM tag or constructor displayName
+      return inst => instHasType(inst, selector);
 
-  default:
-    throw new TypeError('Expecting a string or Component Constructor');
+    default:
+      throw new TypeError('Expecting a string or Component Constructor');
   }
 }
 

diff --git a/src/ReactWrapper.js b/src/ReactWrapper.js
@@ -60,7 +60,7 @@ export default class ReactWrapper {
           Component={nodes.type}
           props={nodes.props}
           context={options.context}
-          />
+        />
       );
       this.root = this;
       this.node = this.component.getWrappedComponent();
@@ -434,8 +434,8 @@ export default class ReactWrapper {
   }
 
   /**
-   * Reduces the current array of nodes to another array. Each node is passed in as a `ShallowWrapper`
-   * to the reducer function.
+   * Reduces the current array of nodes to another array.
+   * Each node is passed in as a `ShallowWrapper` to the reducer function.
    *
    * @param {Function} fn - the reducer function
    * @param {*} initialValue - the initial value

diff --git a/src/ShallowTraversal.js b/src/ShallowTraversal.js
@@ -75,29 +75,29 @@ export function nodeHasType(node, type) {
 
 export function buildPredicate(selector) {
   switch (typeof selector) {
-  case 'function':
-    // selector is a component constructor
-    return node => node && node.type === selector;
-
-  case 'string':
-    if (!isSimpleSelector(selector)) {
-      throw selectorError(selector);
-    }
-    if (isCompoundSelector.test(selector)) {
-      return AND(splitSelector(selector).map(buildPredicate));
-    }
-    if (selector[0] === '.') {
-      // selector is a class name
-      return node => hasClassName(node, selector.substr(1));
-    } else if (selector[0] === '#') {
-      // selector is an id name
-      return node => nodeHasId(node, selector.substr(1));
-    }
-    // selector is a string. match to DOM tag or constructor displayName
-    return node => nodeHasType(node, selector);
-
-  default:
-    throw new TypeError('Expecting a string or Component Constructor');
+    case 'function':
+      // selector is a component constructor
+      return node => node && node.type === selector;
+
+    case 'string':
+      if (!isSimpleSelector(selector)) {
+        throw selectorError(selector);
+      }
+      if (isCompoundSelector.test(selector)) {
+        return AND(splitSelector(selector).map(buildPredicate));
+      }
+      if (selector[0] === '.') {
+        // selector is a class name
+        return node => hasClassName(node, selector.substr(1));
+      } else if (selector[0] === '#') {
+        // selector is an id name
+        return node => nodeHasId(node, selector.substr(1));
+      }
+      // selector is a string. match to DOM tag or constructor displayName
+      return node => nodeHasType(node, selector);
+
+    default:
+      throw new TypeError('Expecting a string or Component Constructor');
   }
 }
 

diff --git a/src/Utils.js b/src/Utils.js
@@ -18,23 +18,23 @@ export function onPrototype(Component, lifecycle, method) {
   Object.getOwnPropertyNames(proto).forEach((name) => {
     if (typeof proto[name] !== 'function') return;
     switch (name) {
-    case 'componentDidMount':
-    case 'componentWillMount':
-    case 'componentDidUnmount':
-    case 'componentWillUnmount':
-    case 'componentWillReceiveProps':
-    case 'componentDidUpdate':
-    case 'componentWillUpdate':
-    case 'shouldComponentUpdate':
-    case 'render':
-      if (lifecycle) lifecycle(proto, name);
-      break;
-    case 'constructor':
-      // don't spy on the constructor, even though it shows up in the prototype
-      break;
-    default:
-      if (method) method(proto, name);
-      break;
+      case 'componentDidMount':
+      case 'componentWillMount':
+      case 'componentDidUnmount':
+      case 'componentWillUnmount':
+      case 'componentWillReceiveProps':
+      case 'componentDidUpdate':
+      case 'componentWillUpdate':
+      case 'shouldComponentUpdate':
+      case 'render':
+        if (lifecycle) lifecycle(proto, name);
+        break;
+      case 'constructor':
+        // don't spy on the constructor, even though it shows up in the prototype
+        break;
+      default:
+        if (method) method(proto, name);
+        break;
     }
   });
 }

diff --git a/src/__tests__/.eslintrc b/src/__tests__/.eslintrc
@@ -4,5 +4,7 @@
     "react/no-multi-comp": 0,
     "react/prop-types": 0,
     "react/no-did-mount-set-state": 0,
+    "react/prefer-es6-class": 0,
+    "no-param-reassign": 0,
   }
 }