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

Update discord links, lint markdown #5586

Merged
merged 3 commits into from
Feb 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Please note this issue tracker is not a help forum. We recommend using
[StackOverflow](https://stackoverflow.com/questions/tagged/jest) or our
[discord channel](http://facebook.github.io/jest/en/help.html) for questions.
[discord channel](https://discord.gg/MWRhKCj) for questions.
11 changes: 7 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

### Fixes

* `[docs]` Update discord links ([#5586](https://github.com/facebook/jest/pull/5586))
* `[jest-runtime]` Align handling of testRegex on Windows between searching for
tests and instrumentation checks
([#5560](https://github.com/facebook/jest/pull/5560))

### Features
* `[docs]` Add MongoDB guide ([#5571](https://github.com/facebook/jest/pull/5571))

* `[docs]` Add MongoDB guide
([#5571](https://github.com/facebook/jest/pull/5571))
* `[jest-runtime]` Deprecate mapCoverage option.
([#5177](https://github.com/facebook/jest/pull/5177))
* `[babel-jest]` Add option to return sourcemap from the transformer separately
Expand Down Expand Up @@ -43,8 +46,8 @@

* `[jest-config]` Allow `<rootDir>` to be used with `collectCoverageFrom`
([#5524](https://github.com/facebook/jest/pull/5524))
* `[filenames]` Standardize files names in "integration-tests" folder ([#5513](https://github.com/facebook/jest/pull/5513))

* `[filenames]` Standardize files names in "integration-tests" folder
([#5513](https://github.com/facebook/jest/pull/5513))

## jest 22.2.2

Expand Down Expand Up @@ -1603,4 +1606,4 @@ See https://facebook.github.io/jest/blog/2016/12/15/2016-in-jest.html

## <=0.4.0

* See commit history for changes in previous versions of jest.
* See commit history for changes in previous versions of jest.
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,8 @@ issues; go through the process outlined on that page.

## How to Get in Touch

* Discord -
[#jest](https://discordapp.com/channels/102860784329052160/103622435865104384)
on [Reactiflux](http://www.reactiflux.com/)
* Discord - [#jest](https://discord.gg/MWRhKCj) on
[Reactiflux](http://www.reactiflux.com/)

## Code Conventions

Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ You are now set up to use all ES6 features and React specific syntax.

Jest can be used in projects that use [webpack](https://webpack.js.org/) to
manage assets, styles, and compilation. webpack does offer some unique
challenges over other tools. Refer to the [webpack guide](docs/Webpack.md) to get
started.
challenges over other tools. Refer to the [webpack guide](docs/Webpack.md) to
get started.

### Using TypeScript

Expand All @@ -188,7 +188,8 @@ Learn more about using
## Badge

Show the world you're using _Jest_ →
[![tested with jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest) [![jest](https://facebook.github.io/jest/img/jest-badge.svg)](https://github.com/facebook/jest)
[![tested with jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest)
[![jest](https://facebook.github.io/jest/img/jest-badge.svg)](https://github.com/facebook/jest)

```md
[![tested with jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest)
Expand Down
3 changes: 2 additions & 1 deletion docs/Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,8 @@ Specifies notification mode. Requires `notify: true`.
* `success`: send a notification when tests pass.
* `change`: send a notification when the status changed.
* `success-change`: send a notification when tests pass or once when it fails.
* `failure-success`: send a notification when tests fails or once when it passes.
* `failure-success`: send a notification when tests fails or once when it
passes.

### `preset` [string]

Expand Down
168 changes: 121 additions & 47 deletions docs/Es6ClassMocks.md

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions docs/MongoDB.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ const MongodbMemoryServer = require('mongodb-memory-server');
const MONGO_DB_NAME = 'jest';
const mongod = new MongodbMemoryServer.default({
instance: {
dbName: MONGO_DB_NAME
dbName: MONGO_DB_NAME,
},
binary: {
version: '3.2.19'
}
version: '3.2.19',
},
});

module.exports = function() {
Expand Down Expand Up @@ -105,17 +105,20 @@ it('should aggregate docs from collection', async () => {
{type: 'Image'},
{type: 'Document'},
{type: 'Image'},
{type: 'Document'}
{type: 'Document'},
]);

const topFiles = await files
.aggregate([{$group: {_id: '$type', count: {$sum: 1}}}, {$sort: {count: -1}}])
.aggregate([
{$group: {_id: '$type', count: {$sum: 1}}},
{$sort: {count: -1}},
])
.toArray();

expect(topFiles).toEqual([
{_id: 'Document', count: 3},
{_id: 'Image', count: 2},
{_id: 'Video', count: 1}
{_id: 'Video', count: 1},
]);
});
```
Expand Down
4 changes: 1 addition & 3 deletions docs/MoreResources.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ projects.

Ask questions and find answers from other Jest users like you.
[Reactiflux](http://www.reactiflux.com/) is a Discord chat where a lot of Jest
discussion happens. Check out the
[#jest](https://discordapp.com/channels/102860784329052160/103622435865104384)
channel.
discussion happens. Check out the [#jest](https://discord.gg/MWRhKCj) channel.

Follow the [Jest Twitter account](https://twitter.com/fbjest) and
[blog](/jest/blog/) to find out what's happening in the world of Jest.
6 changes: 3 additions & 3 deletions docs/SnapshotTesting.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ Failed snapshots can also be updated interactively in watch mode:

![](/jest/img/content/interactiveSnapshot.png)

Once you enter Interactive Snapshot Mode, Jest will step you through
the failed snapshots one test suite at a time and give you the opportunity to
review the failed output.
Once you enter Interactive Snapshot Mode, Jest will step you through the failed
snapshots one test suite at a time and give you the opportunity to review the
failed output.

From here you can choose to update that snapshot or skip to the next:

Expand Down
2 changes: 1 addition & 1 deletion packages/jest-editor-support/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is only useful if you are interested in building an editor integration for
Jest.

For now as an end user, we'd recommend looking at either
[vscode-jest](https://github.com/jest-community/vscode-jest/) or
[vscode-jest](https://github.com/jest-community/vscode-jest/) or
[majestic](https://github.com/Raathigesh/majestic/).

## Note
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ community. We are incredibly grateful that we get the opportunity to work on
improving JavaScript testing together. If you'd like to contribute to Jest,
please don't hesitate to reach out to us on
[GitHub](https://github.com/facebook/jest) or on
[Discord](https://discordapp.com/channels/102860784329052160/103622435865104384)._
[Discord](https://discord.gg/MWRhKCj)._
4 changes: 1 addition & 3 deletions website/core/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ class Footer extends React.Component {
>
Stack Overflow
</a>
<a href="https://discordapp.com/channels/102860784329052160/103622435865104384">
Jest Chat
</a>
<a href="https://discord.gg/MWRhKCj">Jest Chat</a>
<a href="https://twitter.com/fbjest" target="_blank">
Twitter
</a>
Expand Down
3 changes: 2 additions & 1 deletion website/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"migration-guide": "Migrating to Jest",
"mock-function-api": "Mock Functions",
"mock-functions": "Mock Functions",
"mongodb": "Using with MongoDB",
"more-resources": "More Resources",
"puppeteer": "Using with puppeteer",
"setup-teardown": "Setup and Teardown",
Expand Down Expand Up @@ -43,7 +44,7 @@
"pages-strings": {
"Find what you're looking for in our detailed documentation and guides.\\n\\n- Learn how to [get started](/jest/docs/en/getting-started.html) with Jest.\\n- [Troubleshoot](/jest/docs/en/troubleshooting.html) problems with Jest.\\n- Learn how to [configure Jest](/jest/docs/en/configuration.html).\\n- Look at the full [API Reference](/jest/docs/en/api.html).|no description given": "Find what you're looking for in our detailed documentation and guides.\\n\\n- Learn how to [get started](/jest/docs/en/getting-started.html) with Jest.\\n- [Troubleshoot](/jest/docs/en/troubleshooting.html) problems with Jest.\\n- Learn how to [configure Jest](/jest/docs/en/configuration.html).\\n- Look at the full [API Reference](/jest/docs/en/api.html).",
"Browse the docs|no description given": "Browse the docs",
"Ask questions and find answers from other Jest users like you.\\n\\n- Join the [#jest](https://discordapp.com/channels/102860784329052160/103622435865104384) channel on [Reactiflux](http://www.reactiflux.com/), a Discord community.\\n- Many members of the community use Stack Overflow. Read through the [existing questions](https://stackoverflow.com/questions/tagged/jestjs) tagged with **jestjs** or [ask your own](https://stackoverflow.com/questions/ask)!|no description given": "Ask questions and find answers from other Jest users like you.\\n\\n- Join the [#jest](https://discordapp.com/channels/102860784329052160/103622435865104384) channel on [Reactiflux](http://www.reactiflux.com/), a Discord community.\\n- Many members of the community use Stack Overflow. Read through the [existing questions](https://stackoverflow.com/questions/tagged/jestjs) tagged with **jestjs** or [ask your own](https://stackoverflow.com/questions/ask)!",
"Ask questions and find answers from other Jest users like you.\\n\\n- Join the [#jest](https://discord.gg/MWRhKCj) channel on [Reactiflux](http://www.reactiflux.com/), a Discord community.\\n- Many members of the community use Stack Overflow. Read through the [existing questions](https://stackoverflow.com/questions/tagged/jestjs) tagged with **jestjs** or [ask your own](https://stackoverflow.com/questions/ask)!|no description given": "Ask questions and find answers from other Jest users like you.\\n\\n- Join the [#jest](https://discord.gg/MWRhKCj) channel on [Reactiflux](http://www.reactiflux.com/), a Discord community.\\n- Many members of the community use Stack Overflow. Read through the [existing questions](https://stackoverflow.com/questions/tagged/jestjs) tagged with **jestjs** or [ask your own](https://stackoverflow.com/questions/ask)!",
"Join the community|no description given": "Join the community",
"Find out what's new with Jest.\\n\\n- Follow [Jest](https://twitter.com/fbjest) on Twitter.\\n- Subscribe to the [Jest blog](/jest/blog/).\\n- Look at the [changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md).|no description given": "Find out what's new with Jest.\\n\\n- Follow [Jest](https://twitter.com/fbjest) on Twitter.\\n- Subscribe to the [Jest blog](/jest/blog/).\\n- Look at the [changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md).",
"Stay up to date|no description given": "Stay up to date",
Expand Down
9 changes: 4 additions & 5 deletions website/pages/en/help.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ class Help extends React.Component {
content: (
<translate>
Ask questions and find answers from other Jest users like you.\n\n-
Join the
[#jest](https://discordapp.com/channels/102860784329052160/103622435865104384)
channel on [Reactiflux](http://www.reactiflux.com/), a Discord
community.\n- Many members of the community use Stack Overflow. Read
through the [existing
Join the [#jest](https://discord.gg/MWRhKCj) channel on
[Reactiflux](http://www.reactiflux.com/), a Discord community.\n-
Many members of the community use Stack Overflow. Read through the
[existing
questions](https://stackoverflow.com/questions/tagged/jestjs) tagged
with **jestjs** or [ask your
own](https://stackoverflow.com/questions/ask)!
Expand Down