Merge b58421b into f3feb6d

.eslintrc.yml

@@ -0,0 +1,22 @@
+ecmaFeatures:
+  modules: true
+  blockBindings: true
+  arrowFunctions: true
+  destructuring: true
+  templateStrings: true
+rules:
+  indent:
+    - 2
+    - 2
+    - SwitchCase: 1
+  quotes:
+    - 2
+    - single
+  semi:
+    - 2
+    - always
+  no-var: 2
+env:
+  node: true
+  mocha: true
+extends: 'eslint:recommended'

assets/test-file.js

@@ -1,10 +1,12 @@
+/*eslint no-var: 0*/
+
 var assert = require('assert');
 var CLIEngine = require('eslint').CLIEngine;
 var eol = require('eol');
 
 var cli = new CLIEngine();
 
-var files = process.env.NODE_ESLINT_FILES.split(',');
+var files = process.env.NPM_PACKAGE_CONFIG_ESLINT_FILES.split(',');
 
 var results = cli.executeOnFiles(files).results;
 

bin/eslint-mocha.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/*eslint no-var: 0*/
 
 var yargs = require('yargs');
 var eslintMocha = require('../dist/eslint-mocha').default;

lib/eslint-mocha.js

@@ -5,4 +5,4 @@ export default options => {
   let lintTestFile = initEslint(options);
 
   runMocha(lintTestFile, options);
-}
+};

lib/eslint/initialize.js

@@ -3,9 +3,9 @@ import path from 'path';
 export default options => {
   let { eslintFiles } = options;
 
-  process.env.NODE_ESLINT_FILES = eslintFiles.join(',');
+  process.env.NPM_PACKAGE_CONFIG_ESLINT_FILES = eslintFiles.join(',');
 
   let testFile = path.resolve(__dirname, '../../assets/test-file.js');
 
   return testFile;
-}
+};

lib/mocha/add-compilers.js

@@ -10,4 +10,4 @@ export default (compilers, extensions) => {
 
     _require(mod);
   });
-}
+};

lib/mocha/add-files.js

@@ -12,4 +12,4 @@ export default (mocha, files, extensions, isRecursive, lintTestFile) => {
   files.push(lintTestFile);
 
   files.forEach(file => mocha.addFile(file));
-}
+};

lib/mocha/run.js

@@ -15,4 +15,4 @@ export default (lintTestFile, options) => {
   addFiles(mocha, mochaFiles, extensions, isMochaRecursive, lintTestFile);
 
   mocha.run();
-}
+};

package.json

@@ -11,9 +11,10 @@
     "build": "babel lib -d dist",
     "pretest": "npm run build",
     "precover": "npm run build",
-    "test": "mocha --compilers js:babel-register \"test/@(acceptance|unit)/**/*-test.js\"",
-    "cover": "babel-node node_modules/isparta/bin/isparta cover --include-all-sources --report html node_modules/mocha/bin/_mocha -- --compilers js:babel-register \"test/@(acceptance|unit)/**/*-test.js\"",
-    "debug": "node debug node_modules/mocha/bin/_mocha --compilers js:babel-register \"test/unit/**/*-test.js\""
+    "test": "mocha --compilers js:babel-register \"test/@(acceptance|unit)/**/*-test.js\" test/lint.js assets/test-file.js",
+    "cover": "babel-node node_modules/isparta/bin/isparta cover --include-all-sources --report html --report lcov node_modules/mocha/bin/_mocha -- --compilers js:babel-register \"test/@(acceptance|unit)/**/*-test.js\" test/lint.js assets/test-file.js",
+    "debug": "node debug node_modules/mocha/bin/_mocha --compilers js:babel-register \"test/unit/**/*-test.js\"",
+    "lint": "mocha test/lint.js assets/test-file.js"
   },
   "repository": {
     "type": "git",

test/acceptance/babel-test.js

@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import eol from 'eol';
 import run from '../helpers/run';
 import { symbols } from 'mocha/lib/reporters/base';
 

test/fixtures/babel-project/.eslintrc.yml

@@ -13,4 +13,5 @@ rules:
 env:
   node: true
   mocha: true
+root: true
 extends: 'eslint:recommended'

test/fixtures/failure-project/.eslintrc.yml

@@ -10,4 +10,5 @@ rules:
     - always
 env:
   node: true
+root: true
 extends: 'eslint:recommended'

test/fixtures/success-project/.eslintrc.yml

@@ -11,4 +11,5 @@ rules:
 env:
   node: true
   mocha: true
+root: true
 extends: 'eslint:recommended'

test/helpers/run.js

@@ -24,4 +24,4 @@ export default (args, workingDir) => {
       }
     });
   });
-}
+};

test/lint.js

@@ -0,0 +1 @@
+process.env.NPM_PACKAGE_CONFIG_ESLINT_FILES = 'assets/**/*.js,bin/**/*.js,lib/**/*.js,test/!(fixtures)/**/*.js';

test/unit/eslint/initialize-test.js

@@ -7,16 +7,16 @@ describe('unit - eslint/initialize', function() {
   let env, resolve;
 
   beforeEach(function() {
-    env = process.env.NODE_ESLINT_FILES;
-    process.env.NODE_ESLINT_FILES = '';
+    env = process.env.NPM_PACKAGE_CONFIG_ESLINT_FILES;
+    process.env.NPM_PACKAGE_CONFIG_ESLINT_FILES = '';
 
     initialize.__Rewire__('path', {
       resolve: resolve = sinon.stub()
     });
   });
 
   afterEach(function() {
-    process.env.NODE_ESLINT_FILES = env;
+    process.env.NPM_PACKAGE_CONFIG_ESLINT_FILES = env;
 
     initialize.__ResetDependency__('path');
   });
@@ -26,7 +26,7 @@ describe('unit - eslint/initialize', function() {
       eslintFiles: ['test-file-1', 'test-file-2']
     });
 
-    expect(process.env.NODE_ESLINT_FILES).to.equal('test-file-1,test-file-2');
+    expect(process.env.NPM_PACKAGE_CONFIG_ESLINT_FILES).to.equal('test-file-1,test-file-2');
   });
 
   it('returns test file path', function() {