Merge 02c6004 into aaeeea6

.eslintrc.yml

@@ -1,9 +1,6 @@
-ecmaFeatures:
-  modules: true
-  blockBindings: true
-  arrowFunctions: true
-  destructuring: true
-  templateStrings: true
+parserOptions:
+  ecmaVersion: 6
+  sourceType: 'module'
 rules:
   indent:
     - 2
@@ -17,6 +14,7 @@ rules:
     - always
   no-var: 2
 env:
+  es6: true
   node: true
   mocha: true
 extends: 'eslint:recommended'

package.json

@@ -28,7 +28,7 @@
   "homepage": "https://github.com/kellyselden/eslint-mocha#readme",
   "dependencies": {
     "eol": "0.2.0",
-    "eslint": "^1.0.0",
+    "eslint": "^2.0.0",
     "lodash": "^4.0.0",
     "mocha": "^2.0.0",
     "yargs": "^3.0.0"

test/acceptance/failure-test.js

@@ -27,9 +27,9 @@ describe('acceptance - failure', function() {
       -1\n\
       +0');
       expect(stdout).to.contain(eol.auto('\n\
-        Line 4: "describe" is not defined.\n\
+        Line 4: \'describe\' is not defined.\n\
         Line 5: Expected indentation of 4 space characters but found 2.\n\
-        Line 5: "it" is not defined.\n\
+        Line 5: \'it\' is not defined.\n\
         Line 6: Expected indentation of 6 space characters but found 4.'));
       expect(stdout).to.contain('\n\
       -4\n\

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

@@ -1,5 +1,5 @@
-ecmaFeatures:
-  modules: true
+parserOptions:
+  sourceType: 'module'
 rules:
   indent:
     - 2