Skip to content

Commit

Permalink
test: replace http-server with serve to create a test server (#4056)
Browse files Browse the repository at this point in the history
Fixes Windows compatibility caused by http-party/http-server#525

And, serve is better maintained than http-server or ecstatic.

(cherry picked from commit 3648a51)
  • Loading branch information
sodatea committed May 25, 2019
1 parent 7597c60 commit 1b51835
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(50000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
@@ -1,6 +1,6 @@
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const create = require('@vue/cli-test-utils/createTestProject')
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(40000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const execa = require('execa')
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(20000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const execa = require('execa')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

Expand Down
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(20000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const execa = require('execa')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/build.spec.js
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(30000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/buildLib.spec.js
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(40000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/buildWc.spec.js
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(30000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/buildWcAsync.spec.js
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(15000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/cors.spec.js
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(30000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/modernMode.spec.js
Expand Up @@ -3,7 +3,7 @@ jest.setTimeout(50000)
const fs = require('fs-extra')
const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-service/__tests__/multiPage.spec.js
Expand Up @@ -2,7 +2,7 @@ jest.setTimeout(80000)

const path = require('path')
const portfinder = require('portfinder')
const { createServer } = require('http-server')
const createServer = require('@vue/cli-test-utils/createServer')
const { defaultPreset } = require('@vue/cli/lib/options')
const create = require('@vue/cli-test-utils/createTestProject')
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
Expand Down
12 changes: 12 additions & 0 deletions packages/@vue/cli-test-utils/createServer.js
@@ -0,0 +1,12 @@
const handler = require('serve-handler')
const http = require('http')

module.exports = function createServer (options) {
const server = http.createServer((request, response) => {
return handler(request, response, {
public: options.root
})
})

return server
}
1 change: 1 addition & 0 deletions packages/@vue/cli-test-utils/package.json
Expand Up @@ -26,6 +26,7 @@
"fs-extra": "^7.0.1",
"json-server": "^0.14.0",
"puppeteer": "^1.11.0",
"serve-handler": "^6.0.1",
"strip-ansi": "^5.2.0"
}
}

0 comments on commit 1b51835

Please sign in to comment.