Skip to content

Update from master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gricard merged 16 commits into from
Oct 2, 2017
Merged

Update from master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ff469e0
--showConfig change to show all config, jest-editor-support fails (#4…
recca0120 Sep 28, 2017
80bd4cd
[jest-docblock] add docblock.print() (#4517)
azz Sep 28, 2017
1fcffab
jest-runtime: move babel-core to peer dependenies (#4557)
Sep 28, 2017
1e3ee68
docs: mention about optional `done` argument in test fn (#4556)
jukben Sep 28, 2017
9af7bef
Highlight only last of odd length leading spaces in jest-diff (#4558)
pedrottimark Sep 28, 2017
e81f1fb
feat(jest-editor-snapshot): Add Snapshots metadata (#4570)
vvo Sep 30, 2017
cfe1a9a
chore(vscode): ease flow usage (#4569)
vvo Sep 30, 2017
216e8ed
Add simple rAF polyfill in jsdom environment (#4568)
SimenB Sep 30, 2017
4a3ab53
[jest-docblock] add strip (#4571)
samouri Sep 30, 2017
ec87e1f
Update CODEOWNERS (#4573)
orta Sep 30, 2017
c89ee8c
Vscode jest monorepo support (#4572)
connectdotz Oct 1, 2017
6e5d149
[jest-docblock] Preserve leading whitespace in docblock comments (#4576)
azz Oct 1, 2017
eff7a1c
--showConfig support jest20 and jest21 (#4575)
recca0120 Oct 1, 2017
b430e51
Call chalk.inverse for trailing spaces in jest-matcher-utils (#4578)
pedrottimark Oct 1, 2017
d355b3b
Support rootDir tag in testEnvironment (#4579)
thymikee Oct 2, 2017
7aa3017
Increase coverage in jest-diff (#4583)
pedrottimark Oct 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ module.exports = {
'packages/jest-editor-support/src/Process.js',
'packages/jest-editor-support/src/Runner.js',
'packages/jest-editor-support/src/Settings.js',
'packages/jest-editor-support/src/Snapshot.js',
'packages/jest-editor-support/src/__tests__/Snapshot-test.js',
'packages/jest-jasmine2/src/jasmine/Env.js',
'packages/jest-jasmine2/src/jasmine/Spec.js',
'packages/jest-jasmine2/src/jasmine/Suite.js',
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

# Pings orta when PRs are to this module
packages/jest-editor-support/* @orta
packages/jest-editor-support/src/* @orta
12 changes: 7 additions & 5 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"jest.pathToJest": "yarn jest --",
"editor.rulers": [80],
"files.exclude": {
"**/.git": true,
"**/node_modules": true,
"**/build": true
},
"editor.formatOnSave": true,
"flow.useNPMPackagedFlow": true,
"javascript.validate.enable": false,
"jest.pathToJest": "yarn jest --",
"prettier.eslintIntegration": true,
"prettier.parser": "flow",
"prettier.printWidth": 80,
"prettier.singleQuote": true,
"prettier.trailingComma": "all",
"prettier.semi": true,
"editor.formatOnSave": true,
"prettier.eslintIntegration": true
"prettier.singleQuote": true,
"prettier.trailingComma": "all"
}
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ init:
install:
- ps: Install-Product node $env:nodejs_version x64
- node --version
- curl -fsSL -o yarn.js https://github.com/yarnpkg/yarn/releases/download/v0.28.4/yarn-0.28.4.js
- curl -fsSL -o yarn.js https://github.com/yarnpkg/yarn/releases/download/v1.1.0/yarn-1.1.0.js
- node ./yarn.js --version
- node ./yarn.js install
- node ./yarn.js run build
Expand All @@ -20,7 +20,7 @@ cache:
- .eslintcache

test_script:
- node ./yarn.js run jest -- --color
- node ./yarn.js run jest --color

# Don't actually build.
build: off
Expand Down
3 changes: 2 additions & 1 deletion docs/en/GlobalAPI.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ test('did not rain', () => {

The first argument is the test name; the second argument is a function that contains the expectations to test.

If a promise is returned from `test`, Jest will wait for the promise to resolve before letting the test complete.
> Note: If a **promise is returned** from `test`, Jest will wait for the promise to resolve before letting the test complete.
Jest will also wait if you **provide an argument to the test function**, usually called `done`. This could be handy when you want to test callbacks. See how to test async code [here](http://facebook.github.io/jest/docs/en/asynchronous.html#callbacks).

For example, let's say `fetchBeverageList()` returns a promise that is supposed to resolve to a list that has `lemon` in it. You can test this with:

Expand Down
Loading