From 2a4eb38f5334a878b25e0ea4efdf143c5d941f3f Mon Sep 17 00:00:00 2001 From: Chad Fawcett Date: Sat, 28 Oct 2017 10:43:04 -0700 Subject: [PATCH 1/4] File auto formatting on yarn start --- website/i18n/en.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/website/i18n/en.json b/website/i18n/en.json index c1ac497f115f..019a820fe32c 100644 --- a/website/i18n/en.json +++ b/website/i18n/en.json @@ -1,4 +1,5 @@ { + "_comment": "This file is auto-generated by write-translations.js", "localized-strings": { "next": "Next", "previous": "Previous", @@ -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", @@ -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" } } \ No newline at end of file From 91d70b422830f2d2b34eeb7f8bf0177145d08e76 Mon Sep 17 00:00:00 2001 From: Chad Fawcett Date: Sat, 28 Oct 2017 10:45:16 -0700 Subject: [PATCH 2/4] Fix Expect line wrapping --- docs/ExpectAPI.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/ExpectAPI.md b/docs/ExpectAPI.md index d4bdb54456e9..bbdc8814b817 100644 --- a/docs/ExpectAPI.md +++ b/docs/ExpectAPI.md @@ -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' }, From 5466b2e4e0ef32644939e430096a8dccbca7fe83 Mon Sep 17 00:00:00 2001 From: Chad Fawcett Date: Sat, 28 Oct 2017 10:46:46 -0700 Subject: [PATCH 3/4] Fix Jest Object line wrapping --- docs/JestObjectAPI.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/JestObjectAPI.md b/docs/JestObjectAPI.md index fba3f5a013c6..1dff5ec8c9e5 100644 --- a/docs/JestObjectAPI.md +++ b/docs/JestObjectAPI.md @@ -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'; ``` From 17df80817302caefab6e5a8a38c8e808534bff6e Mon Sep 17 00:00:00 2001 From: Chad Fawcett Date: Sat, 28 Oct 2017 10:54:36 -0700 Subject: [PATCH 4/4] Add change to CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 013b611055fe..2b5869fe0eba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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))