From b4ffa7fd5e6244947cbe6623be939f42c62216ee Mon Sep 17 00:00:00 2001 From: Ari Porad Date: Thu, 17 Sep 2015 17:19:55 -0700 Subject: [PATCH 1/2] update eslint --- packages/eslint-config-airbnb/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json index 050567251f..3993f06abd 100644 --- a/packages/eslint-config-airbnb/package.json +++ b/packages/eslint-config-airbnb/package.json @@ -28,7 +28,7 @@ "devDependencies": { "babel-eslint": "4.0.10", "babel-tape-runner": "1.2.0", - "eslint": "1.1.0", + "eslint": "^1.4.3", "eslint-plugin-react": "3.2.3", "react": "0.13.3", "tape": "4.2.0" From 556f36ef6016d7dadb32244724552a0f47cd2227 Mon Sep 17 00:00:00 2001 From: Ari Porad Date: Thu, 17 Sep 2015 17:22:53 -0700 Subject: [PATCH 2/2] update tests to comply with id-length --- .../eslint-config-airbnb/test/test-base.js | 8 ++--- .../test/test-react-order.js | 36 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/eslint-config-airbnb/test/test-base.js b/packages/eslint-config-airbnb/test/test-base.js index ecf06cdf58..555c7ffd54 100644 --- a/packages/eslint-config-airbnb/test/test-base.js +++ b/packages/eslint-config-airbnb/test/test-base.js @@ -1,13 +1,13 @@ import test from 'tape'; import base from '../base'; -test('base: does not reference react', t => { - t.plan(2); +test('base: does not reference react', tst => { + tst.plan(2); - t.notOk(base.plugins, 'plugins is unspecified'); + tst.notOk(base.plugins, 'plugins is unspecified'); // scan rules for react/ and fail if any exist const reactRuleIds = Object.keys(base.rules) .filter(ruleId => ruleId.indexOf('react/') === 0); - t.deepEquals(reactRuleIds, [], 'there are no react/ rules'); + tst.deepEquals(reactRuleIds, [], 'there are no react/ rules'); }); diff --git a/packages/eslint-config-airbnb/test/test-react-order.js b/packages/eslint-config-airbnb/test/test-react-order.js index 9ef23f6737..fca3ccdbb0 100644 --- a/packages/eslint-config-airbnb/test/test-react-order.js +++ b/packages/eslint-config-airbnb/test/test-react-order.js @@ -22,15 +22,15 @@ ${body} `; } -test('validate react prop order', t => { - t.test('make sure our eslintrc has React linting dependencies', t => { - t.plan(2); - t.equal(eslintrc.parser, 'babel-eslint', 'uses babel-eslint'); - t.equal(eslintrc.plugins[0], 'react', 'uses eslint-plugin-react'); +test('validate react prop order', tst => { + tst.test('make sure our eslintrc has React linting dependencies', tst => { + tst.plan(2); + tst.equal(eslintrc.parser, 'babel-eslint', 'uses babel-eslint'); + tst.equal(eslintrc.plugins[0], 'react', 'uses eslint-plugin-react'); }); - t.test('passes a good component', t => { - t.plan(3); + tst.test('passes a good component', tst => { + tst.plan(3); const result = lint(wrapComponent(` componentWillMount() { } componentDidMount() { } @@ -42,13 +42,13 @@ test('validate react prop order', t => { render() { return
; } `)); - t.notOk(result.warningCount, 'no warnings'); - t.notOk(result.errorCount, 'no errors'); - t.deepEquals(result.messages, [], 'no messages in results'); + tst.notOk(result.warningCount, 'no warnings'); + tst.notOk(result.errorCount, 'no errors'); + tst.deepEquals(result.messages, [], 'no messages in results'); }); - t.test('order: when random method is first', t => { - t.plan(2); + tst.test('order: when random method is first', tst => { + tst.plan(2); const result = lint(wrapComponent(` someMethod() { } componentWillMount() { } @@ -60,12 +60,12 @@ test('validate react prop order', t => { render() { return
; } `)); - t.ok(result.errorCount, 'fails'); - t.equal(result.messages[0].ruleId, 'react/sort-comp', 'fails due to sort'); + tst.ok(result.errorCount, 'fails'); + tst.equal(result.messages[0].ruleId, 'react/sort-comp', 'fails due to sort'); }); - t.test('order: when random method after lifecycle methods', t => { - t.plan(2); + tst.test('order: when random method after lifecycle methods', tst => { + tst.plan(2); const result = lint(wrapComponent(` componentWillMount() { } componentDidMount() { } @@ -77,7 +77,7 @@ test('validate react prop order', t => { render() { return
; } `)); - t.ok(result.errorCount, 'fails'); - t.equal(result.messages[0].ruleId, 'react/sort-comp', 'fails due to sort'); + tst.ok(result.errorCount, 'fails'); + tst.equal(result.messages[0].ruleId, 'react/sort-comp', 'fails due to sort'); }); });