Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
orta committed Oct 15, 2017
2 parents 3f3bf26 + a3bcb33 commit 511e219
Show file tree
Hide file tree
Showing 6 changed files with 2,384 additions and 55 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ docs/js_ref_dsl_docs.json

types/index.d.ts
.jest/
test-results.json
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ matrix:
- node_js: node
before_script:
- greenkeeper-lockfile-update
after_script:
- yarn run link
script:
- echo "This is only for running the real danger on this repo"
- danger run --verbose
after_script:
- greenkeeper-lockfile-upload

# Create some fake projects at runtime
Expand Down
3 changes: 3 additions & 0 deletions dangerfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ schedule(async () => {
import yarn from "danger-plugin-yarn"
schedule(yarn())

import jest from "danger-plugin-jest"
jest()

// Some good old-fashioned maintainance upkeep

// Ensure the danger.d.ts is always up to date inside this repo.
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"transform": {
".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
},
"testResultsProcessor": "jest-json-reporter",
"testRegex": "(.test)\\.(ts|tsx)$",
"verbose": true,
"testPathIgnorePatterns": ["/node_modules/", "/distribution/", "/types/"],
Expand Down Expand Up @@ -72,10 +73,12 @@
"babel-preset-es2015": "7.0.0-alpha.19",
"babel-preset-stage-3": "7.0.0-alpha.19",
"babel-traverse": "7.0.0-alpha.19",
"danger-plugin-jest": "^1.0.1",
"danger-plugin-yarn": "^1.0.0",
"date-fns": "^1.28.3",
"husky": "^0.14.0",
"jest": "21",
"jest-json-reporter": "^1.2.2",
"lint-staged": "^4.0.0",
"madge": "^2.0.0",
"prettier": "^1.7.4",
Expand Down
Loading

0 comments on commit 511e219

Please sign in to comment.