Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed: test coverage & jest config
  • Loading branch information
Molunerfinn committed Nov 6, 2017
1 parent 4e0e011 commit 51f4dc8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .babelrc
Expand Up @@ -3,12 +3,14 @@
["env", { "modules": false }],
"stage-2"
],
"plugins": ["transform-runtime"],
"plugins": [
"transform-runtime"
],
"comments": false,
"env": {
"test": {
"presets": ["env", "stage-2"],
"plugins": [ "istanbul","transform-es2015-modules-commonjs"]
"plugins": ["transform-es2015-modules-commonjs"]
}
}
}
4 changes: 3 additions & 1 deletion app.js
@@ -1,3 +1,4 @@
import './env'
import Koa from 'koa'
import json from 'koa-json'
import logger from 'koa-logger'
Expand All @@ -9,13 +10,14 @@ import serve from 'koa-static'
import historyApiFallback from 'koa2-history-api-fallback'
import koaRouter from 'koa-router'
import koaBodyparser from 'koa-bodyparser'
require('dotenv').config({path: `.env.${process.env.NODE_ENV}`, silent: true})

const app = new Koa()
const router = koaRouter()

let port = process.env.port

console.log(process.env.DB_USER, process.env.NODE_ENV, process.env.port, `.env.${process.env.NODE_ENV}`)

app.use(koaBodyparser())
app.use(json())
app.use(logger())
Expand Down
3 changes: 3 additions & 0 deletions env.js
@@ -0,0 +1,3 @@
import * as dotenv from 'dotenv'
let path = process.env.NODE_ENV === 'test' ? '.env.test' : '.env'
dotenv.config({path, silent: true})
5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -8,7 +8,7 @@
"dev": "node build/dev-server.js",
"build": "node build/build.js",
"server": "nodemon -w app.js -w server server-entry.js",
"test": "cross-env NODE_ENV=test jest --forceExit"
"test": "cross-env NODE_ENV=test jest --forceExit --runInBand"
},
"dependencies": {
"axios": "^0.15.3",
Expand Down Expand Up @@ -99,6 +99,7 @@
"coverageReporters": [
"lcov",
"text"
]
],
"collectCoverageFrom": ["!env.js", "server/**/*.js", "app.js"]
}
}
2 changes: 1 addition & 1 deletion server/config/db.js
@@ -1,5 +1,5 @@
import Sequelize from 'sequelize'
require('dotenv').config({silent: true})
import '../../env'

// 使用连接的形式进行连接的话,注意将root: 后面的XXXX改成自己数据库的密码
const Todolist = new Sequelize(`mysql://${process.env.DB_USER}:${process.env.DB_PASSWORD}@localhost/todolist`, {
Expand Down

0 comments on commit 51f4dc8

Please sign in to comment.