Skip to content

Commit d1a5298

Browse files
committed
adjust build setup
1 parent 8785b79 commit d1a5298

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

build/karma.cover.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var base = require('./karma.base.config.js')
33
module.exports = function (config) {
44
var options = Object.assign(base, {
55
browsers: ['PhantomJS'],
6-
reporters: ['progress', 'coverage'],
6+
reporters: ['mocha', 'coverage'],
77
coverageReporter: {
88
reporters: [
99
{ type: 'lcov', dir: '../coverage', subdir: '.' },

build/karma.sauce.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ module.exports = function (config) {
7474
singleRun: true,
7575
browsers: Object.keys(batch),
7676
customLaunchers: batch,
77-
reporters: ['progress', 'saucelabs'],
77+
reporters: process.env.CI
78+
? ['dots', 'saucelabs'] // avoid spamming CI output
79+
: ['progress', 'saucelabs'],
7880
sauceLabs: {
7981
testName: 'Vue.js unit tests',
8082
recordScreenshots: false,

build/release.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ if [[ $REPLY =~ ^[Yy]$ ]]
88
then
99
echo "Releasing $VERSION ..."
1010

11-
npm test 2>/dev/null
11+
npm run lint
12+
npm run flow
13+
npm run test:cover
14+
npm run test:e2e
15+
npm run test:ssr
16+
npm run test:sauce
1217

1318
# build
1419
VERSION=$VERSION npm run build

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dev:compiler": "webpack --watch --config build/webpack.compiler.dev.config.js",
1717
"build": "NODE_ENV=production node build/build.js",
1818
"build:ssr": "npm run build -- vue.common.js,vue-template-compiler,vue-server-renderer",
19-
"test": "npm run lint && flow check && npm run test:cover && npm run test:unit && npm run test:e2e && npm run test:ssr",
19+
"test": "npm run lint && flow check && npm run test:cover && npm run test:e2e -- --env phantomjs && npm run test:ssr",
2020
"test:unit": "NODE_ENV=development karma start build/karma.unit.config.js",
2121
"test:cover": "NODE_ENV=development karma start build/karma.cover.config.js",
2222
"test:e2e": "npm run build -- vue.js && node test/e2e/runner.js",
@@ -67,11 +67,11 @@
6767
"karma-coverage": "^1.0.0",
6868
"karma-firefox-launcher": "^1.0.0",
6969
"karma-jasmine": "^1.0.2",
70+
"karma-mocha-reporter": "^2.0.4",
7071
"karma-phantomjs-launcher": "^1.0.0",
7172
"karma-safari-launcher": "^1.0.0",
7273
"karma-sauce-launcher": "^1.0.0",
7374
"karma-sourcemap-loader": "^0.3.0",
74-
"karma-spec-reporter": "^0.0.26",
7575
"karma-webpack": "^1.7.0",
7676
"lodash": "^4.13.1",
7777
"nightwatch": "^0.9.0",

test/e2e/runner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (args.indexOf('--config') === -1) {
1212
args = args.concat(['--config', 'build/nightwatch.config.js'])
1313
}
1414
if (args.indexOf('--env') === -1) {
15-
args = args.concat(['--env', 'chrome,firefox'])
15+
args = args.concat(['--env', 'chrome,firefox,phantomjs'])
1616
}
1717
var i = args.indexOf('--test')
1818
if (i > -1) {

0 commit comments

Comments
 (0)