Skip to content

Commit

Permalink
fix(ci): fix ci
Browse files Browse the repository at this point in the history
fix ci
  • Loading branch information
louiswu committed Apr 30, 2019
1 parent 2d7a302 commit 762b923
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
version: 2
jobs:
build:
context: global
docker:
# specify the version you desire here
- image: circleci/node:10.14
Expand Down Expand Up @@ -36,3 +35,4 @@ jobs:

# run tests!
- run: yarn test
- run: yarn cov
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
package-lock.json
yarn.lock
yarn.lock
coverage
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
package-lock.json
yarn.lock
yarn.lock
coverage
13 changes: 5 additions & 8 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ module.exports = {
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,
collectCoverage: true,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: null,

// The directory where Jest should output its coverage files
coverageDirectory: "coverage",
coverageDirectory: 'coverage',

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
Expand Down Expand Up @@ -124,7 +124,7 @@ module.exports = {
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "node",
testEnvironment: 'node',

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},
Expand All @@ -133,10 +133,7 @@ module.exports = {
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
testMatch: [
"**/__tests__/**/*.js?(x)",
"**/?(*.)+(spec|test).js?(x)"
],
testMatch: ['**/__tests__/**/*.js?(x)', '**/?(*.)+(spec|test).js?(x)']

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
Expand Down Expand Up @@ -177,4 +174,4 @@ module.exports = {

// Whether to use watchman for file crawling
// watchman: true,
};
}
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"tsn": "ts-node --no-cache",
"release": "standard-version",
"pub": "git push --follow-tags origin master && npm publish",
"test": "jest"
"test": "jest --config jest.config.js",
"cov": "codecov"
},
"engines": {
"node": ">= 7.6.0"
Expand All @@ -23,6 +24,7 @@
"@types/node": "^11.13.8",
"babel-core": "^6.26.3",
"babel-loader": "^8.0.4",
"codecov": "^3.3.0",
"commitizen": "^3.1.1",
"cross-env": "^5.2.0",
"cz-conventional-changelog": "^2.1.0",
Expand Down

0 comments on commit 762b923

Please sign in to comment.