Forráskód Böngészése

adjust build setup

Evan You 10 éve
szülő
commit
d1a5298372
5 módosított fájl, 13 hozzáadás és 6 törlés
  1. 1 1
      build/karma.cover.config.js
  2. 3 1
      build/karma.sauce.config.js
  3. 6 1
      build/release.sh
  4. 2 2
      package.json
  5. 1 1
      test/e2e/runner.js

+ 1 - 1
build/karma.cover.config.js

@@ -3,7 +3,7 @@ var base = require('./karma.base.config.js')
 module.exports = function (config) {
   var options = Object.assign(base, {
     browsers: ['PhantomJS'],
-    reporters: ['progress', 'coverage'],
+    reporters: ['mocha', 'coverage'],
     coverageReporter: {
       reporters: [
         { type: 'lcov', dir: '../coverage', subdir: '.' },

+ 3 - 1
build/karma.sauce.config.js

@@ -74,7 +74,9 @@ module.exports = function (config) {
     singleRun: true,
     browsers: Object.keys(batch),
     customLaunchers: batch,
-    reporters: ['progress', 'saucelabs'],
+    reporters: process.env.CI
+      ? ['dots', 'saucelabs'] // avoid spamming CI output
+      : ['progress', 'saucelabs'],
     sauceLabs: {
       testName: 'Vue.js unit tests',
       recordScreenshots: false,

+ 6 - 1
build/release.sh

@@ -8,7 +8,12 @@ if [[ $REPLY =~ ^[Yy]$ ]]
 then
   echo "Releasing $VERSION ..."
 
-  npm test 2>/dev/null
+  npm run lint
+  npm run flow
+  npm run test:cover
+  npm run test:e2e
+  npm run test:ssr
+  npm run test:sauce
 
   # build
   VERSION=$VERSION npm run build

+ 2 - 2
package.json

@@ -16,7 +16,7 @@
     "dev:compiler": "webpack --watch --config build/webpack.compiler.dev.config.js",
     "build": "NODE_ENV=production node build/build.js",
     "build:ssr": "npm run build -- vue.common.js,vue-template-compiler,vue-server-renderer",
-    "test": "npm run lint && flow check && npm run test:cover && npm run test:unit && npm run test:e2e && npm run test:ssr",
+    "test": "npm run lint && flow check && npm run test:cover && npm run test:e2e -- --env phantomjs && npm run test:ssr",
     "test:unit": "NODE_ENV=development karma start build/karma.unit.config.js",
     "test:cover": "NODE_ENV=development karma start build/karma.cover.config.js",
     "test:e2e": "npm run build -- vue.js && node test/e2e/runner.js",
@@ -67,11 +67,11 @@
     "karma-coverage": "^1.0.0",
     "karma-firefox-launcher": "^1.0.0",
     "karma-jasmine": "^1.0.2",
+    "karma-mocha-reporter": "^2.0.4",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-safari-launcher": "^1.0.0",
     "karma-sauce-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.0",
-    "karma-spec-reporter": "^0.0.26",
     "karma-webpack": "^1.7.0",
     "lodash": "^4.13.1",
     "nightwatch": "^0.9.0",

+ 1 - 1
test/e2e/runner.js

@@ -12,7 +12,7 @@ if (args.indexOf('--config') === -1) {
   args = args.concat(['--config', 'build/nightwatch.config.js'])
 }
 if (args.indexOf('--env') === -1) {
-  args = args.concat(['--env', 'chrome,firefox'])
+  args = args.concat(['--env', 'chrome,firefox,phantomjs'])
 }
 var i = args.indexOf('--test')
 if (i > -1) {