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.

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

Jump to bottom

Fix docs overlapping navigation #4781

Merged
merged 5 commits into from
Nov 18, 2017
Merged

Fix docs overlapping navigation #4781

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a4eb38
File auto formatting on yarn start
chadfawcett Oct 28, 2017
91d70b4
Fix Expect line wrapping
chadfawcett Oct 28, 2017
5466b2e
Fix Jest Object line wrapping
chadfawcett Oct 28, 2017
17df808
Add change to CHANGELOG
chadfawcett Oct 28, 2017
b8060f2
Merge branch 'master' of github.com:facebook/jest into fix-doc-word-wrap
chadfawcett Nov 18, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
* `[jest-worker]` Initial version of parallel worker abstraction, say hello! ([#4497](https://github.com/facebook/jest/pull/4497))

### Chore & Maintenance
* `[docs]` Wrap code comments at 80 characters
* `[*]` [**BREAKING**] Drop support for Node.js version 4
* `[babel-jest]` Explicitly bump istanbul to newer versions ([#4616](https://github.com/facebook/jest/pull/4616))
* `[expect]` Upgrade mocha and rollup for browser testing ([#4642](https://github.com/facebook/jest/pull/4642))
Expand Down
3 changes: 2 additions & 1 deletion docs/ExpectAPI.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,8 @@ describe('toMatchObject applied to arrays arrays', () => {
]);
});

// .arrayContaining "matches a received array which contains elements that are *not* in the expected array"
// .arrayContaining "matches a received array which contains elements that
// are *not* in the expected array"
test('.toMatchObject does not allow extra elements', () => {
expect([
{ foo: 'bar' },
Expand Down
3 changes: 2 additions & 1 deletion docs/JestObjectAPI.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ jest.mock('../moduleName', () => {
return jest.fn(() => 42);
});

const moduleName = require('../moduleName'); // This runs the function specified as second argument to `jest.mock`.
// This runs the function specified as second argument to `jest.mock`.
const moduleName = require('../moduleName');
moduleName(); // Will return '42';
```

Expand Down
8 changes: 6 additions & 2 deletions website/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"_comment": "This file is auto-generated by write-translations.js",
"localized-strings": {
"next": "Next",
"previous": "Previous",
Expand All @@ -24,7 +25,7 @@
"tutorial-jquery": "DOM Manipulation",
"tutorial-react": "Testing React Apps",
"tutorial-react-native": "Testing React Native Apps",
"TutorialWebpack": "TutorialWebpack",
"tutorial-webpack": "webpack",
"using-matchers": "Using Matchers",
"webpack": "Using with webpack",
"Docs": "Docs",
Expand Down Expand Up @@ -76,6 +77,9 @@
"In this [video](https://egghead.io/lessons/javascript-test-javascript-with-jest) by [Kent C. Dodds](https://twitter.com/kentcdodds) you will learn how to install Jest and write your first unit test.|no description given": "In this [video](https://egghead.io/lessons/javascript-test-javascript-with-jest) by [Kent C. Dodds](https://twitter.com/kentcdodds) you will learn how to install Jest and write your first unit test.",
"Who's using Jest?|no description given": "Who's using Jest?",
"Jest is used by teams of all sizes to test web applications, node.js services, mobile apps, and APIs.|no description given": "Jest is used by teams of all sizes to test web applications, node.js services, mobile apps, and APIs.",
"More Jest Users|no description given": "More Jest Users"
"More Jest Users|no description given": "More Jest Users",
"Help Translate|recruit community translators for your project": "Help Translate",
"Edit this Doc|recruitment message asking to edit the doc source": "Edit",
"Translate this Doc|recruitment message asking to translate the docs": "Translate"
}
}