From 4645ca70fce91ed1bc9afa51ed5045041b8bd4a6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 7 Jan 2018 11:37:43 -0500
Subject: [PATCH] test lint on save

---
 .../__tests__/eslintPlugin.spec.js               | 16 +++++++++++++---
 .../@vue/cli-service/lib/__tests__/build.spec.js |  2 +-
 .../@vue/cli-service/lib/__tests__/serve.spec.js |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js b/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js
index 3b64b5763..8b9812812 100644
--- a/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js
+++ b/packages/@vue/cli-plugin-eslint/__tests__/eslintPlugin.spec.js
@@ -1,8 +1,8 @@
-jest.setTimeout(10000)
+jest.setTimeout(60000)
 
 const path = require('path')
 const create = require('@vue/cli-test-utils/createTestProject')
-// const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
+const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 
 const runSilently = fn => {
   const log = console.log
@@ -48,5 +48,15 @@ test('should work', async () => {
   // should be linted on commit
   expect(await read('src/main.js')).toMatch(';')
 
-  // TODO lint-on-save
+  // lint-on-save
+  write('vue.config.js', 'module.exports = { lintOnSave: true }')
+  await serve(project, async ({ nextUpdate }) => {
+    // linted when starting up the server by eslint-loader
+    expect(await read('src/main.js')).toMatch(';')
+    write('src/main.js', updatedMain)
+    await nextUpdate()
+    await new Promise(r => setTimeout(r, 1000))
+    // should be linted again on save
+    expect(await read('src/main.js')).toMatch(';')
+  })
 })
diff --git a/packages/@vue/cli-service/lib/__tests__/build.spec.js b/packages/@vue/cli-service/lib/__tests__/build.spec.js
index d5ec9bb59..d10efaf93 100644
--- a/packages/@vue/cli-service/lib/__tests__/build.spec.js
+++ b/packages/@vue/cli-service/lib/__tests__/build.spec.js
@@ -1,4 +1,4 @@
-jest.setTimeout(process.env.CI ? 60000 : 20000)
+jest.setTimeout(30000)
 
 const fs = require('fs')
 const path = require('path')
diff --git a/packages/@vue/cli-service/lib/__tests__/serve.spec.js b/packages/@vue/cli-service/lib/__tests__/serve.spec.js
index 91a4fa7d5..8b0542036 100644
--- a/packages/@vue/cli-service/lib/__tests__/serve.spec.js
+++ b/packages/@vue/cli-service/lib/__tests__/serve.spec.js
@@ -1,4 +1,4 @@
-jest.setTimeout(process.env.CI ? 30000 : 10000)
+jest.setTimeout(30000)
 
 const { defaults } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')