Rename jest-matchers to expect (#4345)

* Rename jest-matchers to expect * lint
jestjs · Aug 24, 2017 · a397aba · a397aba
1 parent 64535a1
commit a397aba
Show file tree

Hide file tree

Showing 34 changed files with 25 additions and 33 deletions.
diff --git a/integration_tests/browser-support/browser-test.js b/integration_tests/browser-support/browser-test.js
@@ -7,7 +7,7 @@
  */
 
 /* eslint-disable */
-var expect = require('../../packages/jest-matchers/build-es5/index.js');
+var expect = require('../../packages/expect/build-es5/index.js');
 var mock = require('../../packages/jest-mock/build-es5/index.js');
 var prettyFormat = require('../../packages/pretty-format/build-es5/index.js');
 

diff --git a/packages/jest-matchers/.npmignore → packages/expect/.npmignore b/packages/jest-matchers/.npmignore → packages/expect/.npmignore
diff --git a/packages/jest-matchers/package.json → packages/expect/package.json b/packages/jest-matchers/package.json → packages/expect/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "jest-matchers",
+  "name": "expect",
   "version": "20.0.3",
   "repository": {
     "type": "git",

diff --git a/...tests__/__snapshots__/extend.test.js.snap → ...tests__/__snapshots__/extend.test.js.snap b/...tests__/__snapshots__/extend.test.js.snap → ...tests__/__snapshots__/extend.test.js.snap
diff --git a/...sts__/__snapshots__/matchers.test.js.snap → ...sts__/__snapshots__/matchers.test.js.snap b/...sts__/__snapshots__/matchers.test.js.snap → ...sts__/__snapshots__/matchers.test.js.snap
diff --git a/..._/__snapshots__/spy_matchers.test.js.snap → ..._/__snapshots__/spy_matchers.test.js.snap b/..._/__snapshots__/spy_matchers.test.js.snap → ..._/__snapshots__/spy_matchers.test.js.snap
diff --git a/...napshots__/to_throw_matchers.test.js.snap → ...napshots__/to_throw_matchers.test.js.snap b/...napshots__/to_throw_matchers.test.js.snap → ...napshots__/to_throw_matchers.test.js.snap
@@ -15,7 +15,7 @@ Expected the function to throw an error of type:
   <green>\\"Err2\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrow() error class threw, but should not have 1`] = `
@@ -25,7 +25,7 @@ Expected the function not to throw an error of type:
   <green>\\"Err\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrow() invalid actual 1`] = `
@@ -58,7 +58,7 @@ Expected the function to throw an error matching:
   <green>/banana/</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrow() regexp threw, but should not have 1`] = `
@@ -68,7 +68,7 @@ Expected the function not to throw an error matching:
   <green>/apple/</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrow() strings did not throw at all 1`] = `
@@ -86,7 +86,7 @@ Expected the function to throw an error matching:
   <green>\\"banana\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrow() strings threw, but should not have 1`] = `
@@ -96,7 +96,7 @@ Expected the function not to throw an error matching:
   <green>\\"apple\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrowError() error class did not throw at all 1`] = `
@@ -114,7 +114,7 @@ Expected the function to throw an error of type:
   <green>\\"Err2\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrowError() error class threw, but should not have 1`] = `
@@ -124,7 +124,7 @@ Expected the function not to throw an error of type:
   <green>\\"Err\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrowError() invalid actual 1`] = `
@@ -157,7 +157,7 @@ Expected the function to throw an error matching:
   <green>/banana/</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrowError() regexp threw, but should not have 1`] = `
@@ -167,7 +167,7 @@ Expected the function not to throw an error matching:
   <green>/apple/</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrowError() strings did not throw at all 1`] = `
@@ -185,7 +185,7 @@ Expected the function to throw an error matching:
   <green>\\"banana\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
 
 exports[`.toThrowError() strings threw, but should not have 1`] = `
@@ -195,5 +195,5 @@ Expected the function not to throw an error matching:
   <green>\\"apple\\"</>
 Instead, it threw:
 <red>  Error      </>
-<red>      <dim>at jestExpect (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
+<red>      <dim>at jestExpect (packages/expect/src/__tests__/toThrowMatchers-test.js<dim>:24:74)</>"
 `;
diff --git a/...rs/src/__tests__/assertion_counts.test.js → ...ct/src/__tests__/assertion_counts.test.js b/...rs/src/__tests__/assertion_counts.test.js → ...ct/src/__tests__/assertion_counts.test.js
diff --git a/...src/__tests__/asymmetric_matchers.test.js → ...src/__tests__/asymmetric_matchers.test.js b/...src/__tests__/asymmetric_matchers.test.js → ...src/__tests__/asymmetric_matchers.test.js
diff --git a/...est-matchers/src/__tests__/extend.test.js → packages/expect/src/__tests__/extend.test.js b/...est-matchers/src/__tests__/extend.test.js → packages/expect/src/__tests__/extend.test.js
diff --git a/...t-matchers/src/__tests__/matchers.test.js → ...ges/expect/src/__tests__/matchers.test.js b/...t-matchers/src/__tests__/matchers.test.js → ...ges/expect/src/__tests__/matchers.test.js
diff --git a/...tchers/src/__tests__/spy_matchers.test.js → ...expect/src/__tests__/spy_matchers.test.js b/...tchers/src/__tests__/spy_matchers.test.js → ...expect/src/__tests__/spy_matchers.test.js
diff --git a/...s/src/__tests__/symbol_in_objects.test.js → ...t/src/__tests__/symbol_in_objects.test.js b/...s/src/__tests__/symbol_in_objects.test.js → ...t/src/__tests__/symbol_in_objects.test.js
diff --git a/...s/src/__tests__/to_throw_matchers.test.js → ...t/src/__tests__/to_throw_matchers.test.js b/...s/src/__tests__/to_throw_matchers.test.js → ...t/src/__tests__/to_throw_matchers.test.js
@@ -19,7 +19,7 @@ class Error {
     this.stack =
       'Error\n' +
       '  at jestExpect' +
-      ' (packages/jest-matchers/src/__tests__/toThrowMatchers-test.js:24:74)';
+      ' (packages/expect/src/__tests__/toThrowMatchers-test.js:24:74)';
   }
 }
 

diff --git a/...jest-matchers/src/__tests__/utils.test.js → packages/expect/src/__tests__/utils.test.js b/...jest-matchers/src/__tests__/utils.test.js → packages/expect/src/__tests__/utils.test.js
diff --git a/.../jest-matchers/src/asymmetric_matchers.js → packages/expect/src/asymmetric_matchers.js b/.../jest-matchers/src/asymmetric_matchers.js → packages/expect/src/asymmetric_matchers.js
diff --git a/...src/extract_expected_assertions_errors.js → ...src/extract_expected_assertions_errors.js b/...src/extract_expected_assertions_errors.js → ...src/extract_expected_assertions_errors.js
diff --git a/packages/jest-matchers/src/index.js → packages/expect/src/index.js b/packages/jest-matchers/src/index.js → packages/expect/src/index.js
diff --git a/packages/jest-matchers/src/jasmine_utils.js → packages/expect/src/jasmine_utils.js b/packages/jest-matchers/src/jasmine_utils.js → packages/expect/src/jasmine_utils.js
diff --git a/...jest-matchers/src/jest_matchers_object.js → packages/expect/src/jest_matchers_object.js b/...jest-matchers/src/jest_matchers_object.js → packages/expect/src/jest_matchers_object.js
diff --git a/packages/jest-matchers/src/matchers.js → packages/expect/src/matchers.js b/packages/jest-matchers/src/matchers.js → packages/expect/src/matchers.js
diff --git a/packages/jest-matchers/src/spy_matchers.js → packages/expect/src/spy_matchers.js b/packages/jest-matchers/src/spy_matchers.js → packages/expect/src/spy_matchers.js
diff --git a/...es/jest-matchers/src/to_throw_matchers.js → packages/expect/src/to_throw_matchers.js b/...es/jest-matchers/src/to_throw_matchers.js → packages/expect/src/to_throw_matchers.js
diff --git a/packages/jest-matchers/src/utils.js → packages/expect/src/utils.js b/packages/jest-matchers/src/utils.js → packages/expect/src/utils.js
diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json
@@ -9,8 +9,8 @@
   "main": "build/index.js",
   "dependencies": {
     "chalk": "^2.0.1",
+    "expect": "^20.0.3",
     "jest-snapshot": "^20.0.3",
-    "jest-matchers": "^20.0.3",
     "jest-matcher-utils": "^20.0.3",
     "jest-message-util": "^20.0.3",
     "jest-diff": "^20.0.3"

diff --git a/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js b/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js
@@ -12,11 +12,7 @@ import type {TestResult, Status} from 'types/TestResult';
 import type {GlobalConfig, Path, ProjectConfig} from 'types/Config';
 import type {Event, TestEntry} from 'types/Circus';
 
-import {
-  extractExpectedAssertionsErrors,
-  getState,
-  setState,
-} from 'jest-matchers';
+import {extractExpectedAssertionsErrors, getState, setState} from 'expect';
 import {formatResultsErrors} from 'jest-message-util';
 import {SnapshotState, addSerializer} from 'jest-snapshot';
 import {addEventHandler, ROOT_DESCRIBE_BLOCK_NAME} from '../state';

diff --git a/packages/jest-circus/src/legacy_code_todo_rewrite/jest_expect.js b/packages/jest-circus/src/legacy_code_todo_rewrite/jest_expect.js
@@ -10,7 +10,7 @@
 
 import type {RawMatcherFn} from 'types/Matchers';
 
-import expect from 'jest-matchers';
+import expect from 'expect';
 
 import {
   addSerializer,

diff --git a/packages/jest-jasmine2/package.json b/packages/jest-jasmine2/package.json
@@ -9,10 +9,10 @@
   "main": "build/index.js",
   "dependencies": {
     "chalk": "^2.0.1",
+    "expect": "^20.0.3",
     "graceful-fs": "^4.1.11",
     "jest-diff": "^20.0.3",
     "jest-matcher-utils": "^20.0.3",
-    "jest-matchers": "^20.0.3",
     "jest-message-util": "^20.0.3",
     "jest-snapshot": "^20.0.3"
   },

diff --git a/packages/jest-jasmine2/src/__tests__/__snapshots__/matchers.test.js.snap b/packages/jest-jasmine2/src/__tests__/__snapshots__/matchers.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`matchers proxies matchers to jest-matchers 1`] = `
+exports[`matchers proxies matchers to expect 1`] = `
 "<dim>expect(<red>received</><dim>).toBe(<green>expected</><dim>)
 
 Expected value to be (using ===):

diff --git a/packages/jest-jasmine2/src/__tests__/matchers.test.js b/packages/jest-jasmine2/src/__tests__/matchers.test.js
@@ -10,7 +10,7 @@
 'use strict';
 
 describe('matchers', () => {
-  it('proxies matchers to jest-matchers', () => {
+  it('proxies matchers to expect', () => {
     expect(() => expect(1).toBe(2)).toThrowErrorMatchingSnapshot();
   });
 });
diff --git a/packages/jest-jasmine2/src/jest_expect.js b/packages/jest-jasmine2/src/jest_expect.js
@@ -10,7 +10,7 @@
 
 import type {RawMatcherFn} from 'types/Matchers';
 
-import expect from 'jest-matchers';
+import expect from 'expect';
 import {
   addSerializer,
   toMatchSnapshot,

diff --git a/packages/jest-jasmine2/src/setup_jest_globals.js b/packages/jest-jasmine2/src/setup_jest_globals.js
@@ -11,11 +11,7 @@
 import type {GlobalConfig, Path, ProjectConfig} from 'types/Config';
 import type {Plugin} from 'types/PrettyFormat';
 
-import {
-  extractExpectedAssertionsErrors,
-  getState,
-  setState,
-} from 'jest-matchers';
+import {extractExpectedAssertionsErrors, getState, setState} from 'expect';
 import {SnapshotState, addSerializer} from 'jest-snapshot';
 
 export type SetupOptions = {|

diff --git a/packages/jest-matcher-utils/package.json b/packages/jest-matcher-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-matcher-utils",
-  "description": "A set of utility functions for jest-matchers and related packages",
+  "description": "A set of utility functions for expect and related packages",
   "version": "20.0.3",
   "repository": {
     "type": "git",

diff --git a/scripts/build.js b/scripts/build.js
@@ -41,7 +41,7 @@ const JS_FILES_PATTERN = '**/*.js';
 const IGNORE_PATTERN = '**/__tests__/**';
 const PACKAGES_DIR = path.resolve(__dirname, '../packages');
 
-const INLINE_REQUIRE_BLACKLIST = /packages\/(jest-(circus|diff|get-type|jasmine2|matcher-utils|matchers|message-util|regex-util|snapshot))|pretty-format\//;
+const INLINE_REQUIRE_BLACKLIST = /packages\/expect|(jest-(circus|diff|get-type|jasmine2|matcher-utils|message-util|regex-util|snapshot))|pretty-format\//;
 
 const transformOptions = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '..', '.babelrc'), 'utf8')