Skip to content

Commit

Permalink
bump dependencies and other tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Apr 29, 2016
1 parent 863b10e commit 1eff0bd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
1 change: 1 addition & 0 deletions cli.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env node
/* eslint-disable import-order/import-order */
'use strict';

var debug = require('debug')('xo');
Expand Down
19 changes: 7 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@
"babel-eslint": "^6.0.0",
"debug": "^2.2.0",
"deep-assign": "^1.0.0",
"eslint": "^2.7.0",
"eslint-config-xo": "^0.13.0",
"eslint-formatter-pretty": "^0.1.0",
"eslint": "^2.9.0",
"eslint-config-xo": "^0.14.0",
"eslint-formatter-pretty": "^0.2.1",
"eslint-plugin-ava": "^2.0.0",
"eslint-plugin-babel": "^3.1.0",
"eslint-plugin-import-order": "^2.0.0",
"eslint-plugin-no-use-extend-native": "^0.3.2",
"eslint-plugin-promise": "^1.1.0",
"eslint-plugin-xo": "^0.1.0",
"eslint-plugin-xo": "^0.3.1",
"get-stdin": "^5.0.0",
"globby": "^4.0.0",
"has-flag": "^1.0.0",
"has-flag": "^2.0.0",
"home-or-tmp": "^2.0.0",
"meow": "^3.4.2",
"multimatch": "^2.1.0",
Expand All @@ -93,15 +93,10 @@
"coveralls": "^2.11.9",
"eslint-config-xo-react": "^0.7.0",
"eslint-plugin-react": "^5.0.1",
"execa": "^0.2.2",
"execa": "^0.4.0",
"nyc": "^6.1.1",
"proxyquire": "^1.7.3",
"temp-write": "^2.0.1",
"xo": "sindresorhus/xo#v0.13.0"
},
"xo": {
"ignores": [
"cli.js"
]
"xo": "file:."
}
}
7 changes: 5 additions & 2 deletions test/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,16 @@ test('.lintText() - extends support with `esnext` option', t => {
});

test('always use the Babel parser so esnext syntax won\'t throw in normal mode', t => {
const results = fn.lintText('async function foo() {}\n\nfoo();\n').results;
// TODO: remove the `filename` option when https://github.com/sindresorhus/eslint-plugin-xo/issues/19 is fixed
const results = fn.lintText('async function foo() {}\n\nfoo();\n', {filename: 'x'}).results;
t.is(results[0].errorCount, 0);
});

test('.lintText() - regression test for #71', t => {
// TODO: remove the `filename` option when https://github.com/sindresorhus/eslint-plugin-xo/issues/19 is fixed
const results = fn.lintText(`var foo = { key: 'value' };\nconsole.log(foo);\n`, {
extends: path.join(__dirname, 'fixtures/extends.js')
extends: path.join(__dirname, 'fixtures/extends.js'),
filename: 'x'
}).results;
t.is(results[0].errorCount, 0, results[0]);
});
4 changes: 2 additions & 2 deletions test/cli.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import fs from 'fs';
import path from 'path';
import test from 'ava';
import tempWrite from 'temp-write';
import execa from 'execa';
import path from 'path';

global.Promise = Promise;

Expand All @@ -27,7 +27,7 @@ test('overrides fixture', async () => {
await execa('../../../cli.js', ['--no-local'], {cwd});
});

test.skip('ignores fixture', async t => {
test.skip('ignores fixture', async t => { // eslint-disable-line
const cwd = path.join(__dirname, 'fixtures/ignores');
t.throws(execa('../../../cli.js', ['--no-local'], {cwd}));
});
Expand Down

0 comments on commit 1eff0bd

Please sign in to comment.