From bce8cf9ce9cf0d9ad91af0e7a69f8670e84eff47 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Thu, 12 Jul 2018 00:46:55 +0900
Subject: [PATCH] refs #434 Add mocha test and run in circleci
---
.babelrc | 4 +-
.circleci/config.yml | 5 +--
package-lock.json | 38 ++++++++-----------
package.json | 5 ++-
src/renderer/components/Login/LoginForm.vue | 3 +-
src/renderer/utils/validator.js | 1 +
test/mocha/validator.spec.js | 42 +++++++++++++++++++++
test/unit/index.js | 2 +-
test/unit/specs/LandingPage.spec.js | 22 +++++------
9 files changed, 80 insertions(+), 42 deletions(-)
create mode 100644 src/renderer/utils/validator.js
create mode 100644 test/mocha/validator.spec.js
diff --git a/.babelrc b/.babelrc
index 386f3224..d0598528 100644
--- a/.babelrc
+++ b/.babelrc
@@ -4,7 +4,7 @@
"test": {
"presets": [
["env", {
- "targets": { "node": 7 }
+ "targets": { "node": 9 }
}],
"stage-0"
],
@@ -13,7 +13,7 @@
"main": {
"presets": [
["env", {
- "targets": { "node": 7 }
+ "targets": { "node": 9 }
}],
"stage-0"
]
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e31c0f8..bbe05dec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,6 +19,5 @@ jobs:
paths:
- node_modules
- run:
- name: Eslint
- command: NODE_ENV=production npm run lint
-
+ name: mocha
+ command: npm run mocha
diff --git a/package-lock.json b/package-lock.json
index f55cbfd2..decfd15b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8085,9 +8085,9 @@
"dev": true
},
"growl": {
- "version": "1.10.3",
- "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
- "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
+ "version": "1.10.5",
+ "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
"dev": true
},
"handle-thing": {
@@ -11202,43 +11202,37 @@
}
},
"mocha": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz",
- "integrity": "sha512-kKKs/H1KrMMQIEsWNxGmb4/BGsmj0dkeyotEvbrAuQ01FcWRLssUNXCEUZk6SZtyJBi6EE7SL0zDDtItw1rGhw==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+ "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
"dev": true,
"requires": {
"browser-stdout": "1.3.1",
- "commander": "2.11.0",
+ "commander": "2.15.1",
"debug": "3.1.0",
"diff": "3.5.0",
"escape-string-regexp": "1.0.5",
"glob": "7.1.2",
- "growl": "1.10.3",
+ "growl": "1.10.5",
"he": "1.1.1",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
- "supports-color": "4.4.0"
+ "supports-color": "5.4.0"
},
"dependencies": {
"commander": {
- "version": "2.11.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
- "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
- "dev": true
- },
- "has-flag": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
- "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+ "version": "2.15.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+ "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
"dev": true
},
"supports-color": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
- "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "3.0.0"
}
}
}
diff --git a/package.json b/package.json
index 054f705a..8f398362 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,8 @@
"pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
"test": "npm run unit && npm run e2e",
"unit": "karma start test/unit/karma.conf.js",
- "postinstall": "npm run lint:fix"
+ "postinstall": "npm run lint:fix",
+ "mocha": "BABEL_ENV=test mocha --require babel-register --recursive ./test/mocha/**/*.js"
},
"build": {
"productName": "Whalebird",
@@ -160,7 +161,7 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.31",
"karma-webpack": "^2.0.1",
- "mocha": "^5.1.1",
+ "mocha": "^5.2.0",
"multispinner": "^0.2.1",
"node-loader": "^0.6.0",
"node-sass": "^4.9.0",
diff --git a/src/renderer/components/Login/LoginForm.vue b/src/renderer/components/Login/LoginForm.vue
index 7f282ba6..60ba2016 100644
--- a/src/renderer/components/Login/LoginForm.vue
+++ b/src/renderer/components/Login/LoginForm.vue
@@ -29,6 +29,7 @@