From bee4f912e51646cd3fe517a55faeb80d93cb7a6d Mon Sep 17 00:00:00 2001 From: Smlsun Xie Date: Tue, 17 Jul 2018 21:52:04 +0800 Subject: [PATCH 1/3] add ci flow --- Jenkinsfile | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b7353d..f02a1b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,16 +5,30 @@ pipeline { } } - stages { + stages { stage('wellcome') { steps { sh 'echo "wellcome to dojo !"' } } + stage('install') { + steps { + sh 'npm install' + } + } + stage('test') { + steps { + sh 'npm run test-jenkins' + } + } + stage('report') { + steps { + junit 'jenkins-test-results.xml' + } + } } environment { npm_config_cache = 'npm-cache' HOME = '.' - } -} +} \ No newline at end of file From f1b911d89e30be8eff553278e3cca7e7e742d60a Mon Sep 17 00:00:00 2001 From: smlsunxie Date: Tue, 17 Jul 2018 21:53:38 +0800 Subject: [PATCH 2/3] add test --- config/config.js | 2 +- test/unit/index.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.js b/config/config.js index 3adc115..ab0ed75 100644 --- a/config/config.js +++ b/config/config.js @@ -1,5 +1,5 @@ module.exports = { - username: "user no name", + username: "spooky", log: { host: "211.72.239.243", port: "24224", diff --git a/test/unit/index.test.js b/test/unit/index.test.js index 4a32edc..4e91a5d 100644 --- a/test/unit/index.test.js +++ b/test/unit/index.test.js @@ -15,7 +15,7 @@ describe('unit test', function () { it('display your name', function () { var config = require('./../../config/config'); - expect(config.username).to.be.equal("yourname"); + expect(config.username).to.be.equal("spooky"); require("../../dojo/dojo_start"); }); From 025dcce07e9314ed5f3e4ad15b31dfd5be591d62 Mon Sep 17 00:00:00 2001 From: Smlsun Xie Date: Wed, 18 Jul 2018 12:04:22 +0800 Subject: [PATCH 3/3] pdate --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f02a1b6..e788608 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { } stage('install') { steps { - sh 'npm install' + bat 'npm install' } } stage('test') {