Skip to content

Commit

Permalink
Fix docs overlapping navigation (#4781)
Browse files Browse the repository at this point in the history
* File auto formatting on yarn start

* Fix Expect line wrapping

* Fix Jest Object line wrapping

* Add change to CHANGELOG
  • Loading branch information
chadfawcett authored and cpojer committed Nov 18, 2017
1 parent 14957ab commit 3d84d75
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@

* `[*]` [**BREAKING**] Drop support for Node.js version 4
([#4769](https://github.com/facebook/jest/pull/4769))
* `[docs]` Wrap code comments at 80 characters
([#4781](https://github.com/facebook/jest/pull/4781))
* `[eslint-plugin-jest]` Removed from the Jest core repo, and moved to
https://github.com/jest-community/eslint-plugin-jest
([#4867](https://github.com/facebook/jest/pull/4867))
Expand Down
3 changes: 2 additions & 1 deletion docs/ExpectAPI.md
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,8 @@ describe('toMatchObject applied to arrays arrays', () => {
expect([{foo: 'bar'}, {baz: 1}]).toMatchObject([{foo: 'bar'}, {baz: 1}]);
});

// .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'}, {baz: 1}]).toMatchObject([{foo: 'bar'}]);
});
Expand Down
3 changes: 2 additions & 1 deletion docs/JestObjectAPI.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,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
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"
}
}

0 comments on commit 3d84d75

Please sign in to comment.