From 31f48f0651a8ab3ca2124ace770ef03bd706a5e4 Mon Sep 17 00:00:00 2001
From: Daniel Tschinder <daniel@tschinder.de>
Date: Sat, 15 Oct 2016 11:04:55 +0200
Subject: [PATCH] Update test for eslint 3.8 (babel/babel-eslint#412)

* Update test for eslint 3.8

also ignore yarn lock

* Run lint only on latest version
---
 eslint/babel-eslint-parser/.gitignore         |  1 +
 eslint/babel-eslint-parser/.travis.yml        | 21 ++++++++++++-------
 eslint/babel-eslint-parser/package.json       |  4 ++--
 .../test/non-regression.js                    |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/eslint/babel-eslint-parser/.gitignore b/eslint/babel-eslint-parser/.gitignore
index 93f1361991..2d6ddb5d00 100644
--- a/eslint/babel-eslint-parser/.gitignore
+++ b/eslint/babel-eslint-parser/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 npm-debug.log
+yarn.lock
diff --git a/eslint/babel-eslint-parser/.travis.yml b/eslint/babel-eslint-parser/.travis.yml
index 9f2b522cd5..7f84d147a4 100644
--- a/eslint/babel-eslint-parser/.travis.yml
+++ b/eslint/babel-eslint-parser/.travis.yml
@@ -1,11 +1,16 @@
-git:
-  depth: 1
 sudo: false
 language: node_js
-matrix:
-  include:
-    - node_js: "4"
-    - node_js: "5"
-    - node_js: "6"
+node_js:
+  - "4"
+  - "5"
+  - "6"
 
-script: npm run test-ci
+matrix:
+  fast_finish: true
+  include:
+    - node_js: "node"
+      env: LINT=true
+
+script:
+  - 'if [ -n "${LINT-}" ]; then npm run lint ; fi'
+  - 'if [ -z "${LINT-}" ]; then npm test ; fi'
diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
index 67d0dc49f2..b3fd1282ed 100644
--- a/eslint/babel-eslint-parser/package.json
+++ b/eslint/babel-eslint-parser/package.json
@@ -20,8 +20,8 @@
   "scripts": {
     "bootstrap": "git submodule update --init && cd eslint && npm install",
     "eslint": "cd eslint && mocha -c tests/lib/rules/*.js -r ../eslint-tester.js",
-    "test": "mocha",
-    "test-ci": "npm test && npm run lint",
+    "test": "npm run lint && npm run test-only",
+    "test-only": "mocha",
     "lint": "eslint index.js babylon-to-espree test",
     "fix": "eslint index.js babylon-to-espree test --fix",
     "preversion": "npm test",
diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
index 996cc66b2c..4ddead6e20 100644
--- a/eslint/babel-eslint-parser/test/non-regression.js
+++ b/eslint/babel-eslint-parser/test/non-regression.js
@@ -1196,7 +1196,7 @@ describe("verify", function () {
     verifyAndAssertMessages(
       "const {Bacona} = require('baconjs')",
       { "no-undef": 1, "no-unused-vars": 1 },
-      [ "1:8 'Bacona' is defined but never used. no-unused-vars" ]
+      [ "1:8 'Bacona' is assigned a value but never used. no-unused-vars" ]
     );
   });