Skip to content
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.

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

Merging changes from Origin #1

Merged
merged 29 commits into from
Mar 30, 2017
Merged

Merging changes from Origin #1

merged 29 commits into from
Mar 30, 2017

Conversation

mute
Copy link
Owner

@mute mute commented Mar 30, 2017

Summary

Test plan

epitaphmike and others added 29 commits March 17, 2017 08:39
* Support custom platforms on jest-haste-map

* Run prettier
* [jest-jasmine2] Split `jasmine-light` over multiple files.

* Don't wrap things that don't need to be wrapped.

* Don't wrap things that don't need to be wrapped (again).

* Lint.

* Move source to `jasmine`, alter license.
* [jest-jasmine2] Split `jasmine-light` over multiple files.

* Don't wrap things that don't need to be wrapped.

* Don't wrap things that don't need to be wrapped (again).

* Lint.

* [jest-jasmine2] Trim `jasmine` singleton.

* Adding NHL to companies that use Jest (#3163)

* Support custom platforms on jest-haste-map (#3162)

* Support custom platforms on jest-haste-map

* Run prettier

* Rebase.
* Improve runJest by breaking up the promise chain into functions.

* Use async/await.

* Add a TestSequencer and “Test” type to clarify responsibilities and improve type interfaces.

* async/await in runTests.

* Minor cleanups

* Fix the test.

* Move `runCLI` into the cli folder.

* Updates to TestSequencer + test the code.
* improve pretty-format coverage

* remove contraction

* remove arrow functions to support Node v4

* running prettier
…3153)

* Update snapshots for matchers-test.js

Update snapshots for matchers-test.js

* Converted 'passes' messages to the format {pass: bool}
* Updated expect API docs with .resolves and .rejects

* Fixed linter errors in the docs.

* added API availability status

* minor styling issue fix
* Extract React tests from pretty-format-test.js

* Mock console in one place only
)

* [jest-jasmine2] Pull `expectationResultFactory` out of `jasmine`.

* Test error as a string.
#3196)

* adding spyOn to the list of globals for the eslint env jest/globals setting

* reorder spyOn environmental global based on ascending order rule
* [jest-jasmine2] Rewrite `QueueRunner`.

* Make `FakeTimer` test stack agnostic.

* Update snapshot.

Manually.

* Fix `FakeTimer`.

* Lint.

* Do not use async.

* Revert "Merge pull request #1 from wtgtybhertgeghgtwtg/wtgtybhertgeghgtwtg-patch-1"

This reverts commit 9424111, reversing
changes made to ea0bb8a.
This paragraph alluded to the fact that snapshots should be reviewed (by mentioning pretty-format), but it should be explicitly mentioned.
* Update ManualMocks.md

Below in the example, the fs.js mock file is described as being in __mocks__/fs.js, but in the folder diagram, __mocks__ appears to be empty, and fs.js is at the root level. This PR corrects that.

* update with clearer explanation

* derp, backticking node_modules

* update backticks and spacing

* Update ManualMocks.md
* Support mocking native AsyncFunction

* Add native-async-mock example test

* Use strict

* Return a promise from mock

* Only test async

* Revert returning promise
@mute mute merged commit ec3a6a0 into mute:master Mar 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.