From 604813aa53fa975c08265874c5bb622fa96b80b9 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Thu, 20 Oct 2016 08:50:40 +0800
Subject: [PATCH] Update test config

---
 .travis.yml           |  1 +
 Makefile              |  3 +++
 build/cooking.test.js | 17 ++++++++++-------
 build/deploy-ci.sh    |  6 +++---
 package.json          |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index acb312330..76cf7e2c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ cache:
   - node_modules
   - travis_phantomjs
 before_install:
+- export TRAVIS_COMMIT_MSG="[deploy] $(git log --format='%h - %B' --no-merges -n 1)"
 - export PHANTOMJS_VERSION=2.1.1
 - export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH
 - if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs;
diff --git a/Makefile b/Makefile
index 341c05c9c..9e2053d70 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,9 @@ pub:
 pub-all:
 	npm run pub:all
 
+test:
+	npm run test:watch
+
 help:
 	@echo "   \033[35mmake\033[0m \033[1m命令使用说明\033[0m"
 	@echo "   \033[35mmake install\033[0m\t\033[0m\t\033[0m\t\033[0m\t---  安装依赖"
diff --git a/build/cooking.test.js b/build/cooking.test.js
index f11d542fc..9385f9a4b 100644
--- a/build/cooking.test.js
+++ b/build/cooking.test.js
@@ -1,24 +1,27 @@
-var path = require('path');
 var cooking = require('cooking');
 var config = require('./config');
 var ProgressBarPlugin = require('progress-bar-webpack-plugin');
+var jsLoader = process.env.CI_ENV ? 'isparta-loader' : 'isparta-loader!eslint-loader';
 
 cooking.set({
   entry: './src/index.js',
-  extends: ['vue2', 'lint'],
+  extends: process.env.CI_ENV ? ['vue2'] : ['vue2', 'lint'],
   minimize: false,
   alias: config.alias,
   postcss: config.postcss,
   sourceMap: '#inline-source-map'
 });
 
-cooking.add('vue.loaders.js', 'isparta-loader!eslint-loader');
+cooking.add('vue.loaders.js', jsLoader);
 cooking.add('loader.js.exclude', config.jsexclude);
-cooking.add('preLoader.js', {
+cooking.add('preLoader.0', {
   test: /\.js$/,
-  loader: 'isparta-loader!eslint-loader',
-  exclude: config.jsexclude
+  loader: 'isparta',
+  exclude: config.jsexclude,
+  include: /src|packages/
 });
 
-cooking.add('plugins.process', new ProgressBarPlugin());
+if (!process.env.CI_ENV) {
+  cooking.add('plugins.process', new ProgressBarPlugin());
+}
 module.exports = cooking.resolve();
diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh
index 931df4efd..22711b183 100644
--- a/build/deploy-ci.sh
+++ b/build/deploy-ci.sh
@@ -5,11 +5,11 @@ if [ "$TRAVIS_BRANCH" = "master" ] && [ "$GH_TOKEN" ]; then
   mkdir temp_web
   cd temp_web
   git clone https://$GH_TOKEN@github.com/ElementUI/dev.git && cd dev
-  git config user.name "travis"
-  git config user.email "travis"
+  git config user.name "$(git log --no-merges -n 1 --format=%an)"
+  git config user.email "$(git log --no-merges -n 1 --format=%ae)"
   rm -rf *
   cp -rf ../../examples/element-ui/** .
   git add -A .
-  git commit -m "$TRAVIS_COMMIT"
+  git commit -m "$TRAVIS_COMMIT_MSG"
   git push origin master
 fi
diff --git a/package.json b/package.json
index c85852d61..3122b0177 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "clean": "rimraf lib && rimraf packages/*/lib",
     "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet",
     "test:watch": "karma start test/unit/karma.conf.js",
-    "test": "npm run lint && karma start test/unit/karma.conf.js --single-run"
+    "test": "npm run lint && CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run"
   },
   "repository": {
     "type": "git",