Skip to content

Commit 610d1aa

Browse files
committed
build: move test config files into /test
1 parent a7afcb4 commit 610d1aa

9 files changed

+10
-15
lines changed

Diff for: build/.eslintrc

-5
This file was deleted.

Diff for: package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"dev": "rollup -w -c build/config.js --environment TARGET:web-full-dev",
1616
"dev:cjs": "rollup -w -c build/config.js --environment TARGET:web-runtime-cjs",
1717
"dev:esm": "rollup -w -c build/config.js --environment TARGET:web-runtime-esm",
18-
"dev:test": "karma start build/karma.dev.config.js",
18+
"dev:test": "karma start test/unit/karma.dev.config.js",
1919
"dev:ssr": "rollup -w -c build/config.js --environment TARGET:web-server-renderer",
2020
"dev:compiler": "rollup -w -c build/config.js --environment TARGET:web-compiler ",
2121
"dev:weex": "rollup -w -c build/config.js --environment TARGET:weex-framework ",
@@ -24,16 +24,16 @@
2424
"build:ssr": "npm run build -- vue.runtime.common.js,vue-server-renderer",
2525
"build:weex": "npm run build -- weex-vue-framework,weex-template-compiler",
2626
"test": "npm run lint && flow check && npm run test:types && npm run test:cover && npm run test:e2e -- --env phantomjs && npm run test:ssr && npm run test:weex",
27-
"test:unit": "karma start build/karma.unit.config.js",
28-
"test:cover": "karma start build/karma.cover.config.js",
27+
"test:unit": "karma start test/unit/karma.unit.config.js",
28+
"test:cover": "karma start test/unit/karma.cover.config.js",
2929
"test:e2e": "npm run build -- vue.min.js && node test/e2e/runner.js",
3030
"test:weex": "npm run build:weex && jasmine JASMINE_CONFIG_PATH=test/weex/jasmine.json",
3131
"test:ssr": "npm run build:ssr && jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.json",
3232
"test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2",
3333
"test:types": "tsc -p ./types/test/tsconfig.json",
3434
"lint": "eslint src build test",
3535
"flow": "flow check",
36-
"sauce": "karma start build/karma.sauce.config.js",
36+
"sauce": "karma start test/unit/karma.sauce.config.js",
3737
"bench:ssr": "npm run build:ssr && node benchmarks/ssr/renderToString.js && node benchmarks/ssr/renderToStream.js",
3838
"release": "bash build/release.sh",
3939
"release:weex": "bash build/release-weex.sh",
File renamed without changes.

Diff for: test/e2e/runner.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ server.listen(8080)
99

1010
var args = process.argv.slice(2)
1111
if (args.indexOf('--config') === -1) {
12-
args = args.concat(['--config', 'build/nightwatch.config.js'])
12+
args = args.concat(['--config', 'test/e2e/nightwatch.config.js'])
1313
}
1414
if (args.indexOf('--env') === -1) {
1515
args = args.concat(['--env', 'chrome,phantomjs'])

Diff for: build/karma.base.config.js renamed to test/unit/karma.base.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var alias = require('./alias')
1+
var alias = require('../../build/alias')
22
var webpack = require('webpack')
33

44
var webpackConfig = {
@@ -31,10 +31,10 @@ var webpackConfig = {
3131
module.exports = {
3232
frameworks: ['jasmine'],
3333
files: [
34-
'../test/unit/index.js'
34+
'./index.js'
3535
],
3636
preprocessors: {
37-
'../test/unit/index.js': ['webpack', 'sourcemap']
37+
'./index.js': ['webpack', 'sourcemap']
3838
},
3939
webpack: webpackConfig,
4040
webpackMiddleware: {

Diff for: build/karma.cover.config.js renamed to test/unit/karma.cover.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = function (config) {
66
reporters: ['mocha', 'coverage'],
77
coverageReporter: {
88
reporters: [
9-
{ type: 'lcov', dir: '../coverage', subdir: '.' },
10-
{ type: 'text-summary', dir: '../coverage', subdir: '.' }
9+
{ type: 'lcov', dir: '../../coverage', subdir: '.' },
10+
{ type: 'text-summary', dir: '../../coverage', subdir: '.' }
1111
]
1212
},
1313
singleRun: true,
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)