diff --git a/.eslintrc b/.eslintrc
index 70709ec6..6d351930 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -33,5 +33,13 @@
"no-trailing-spaces": 1,
"object-curly-spacing": [1, "always"],
"quotes": ["warn", "single", { "avoidEscape": true }]
- }
+ },
+ "overrides": [
+ {
+ "files": "src/matchers/*/index.js",
+ "rules": {
+ "import/no-default-export": "error"
+ }
+ }
+ ]
}
diff --git a/README.md b/README.md
index bcddddb3..202dadd8 100644
--- a/README.md
+++ b/README.md
@@ -168,11 +168,11 @@ Since the [breaking changes]() in `25.5.0` you may also need to update your `tsc
Also note that when adding this for the first time this affects which files are compiled by the TypeScript compiler and you might need to add the `include` property as well. See the [TypeScript docs](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html) for more details.
If the above import syntax does not work, replace it with the following:
-
+
```ts
-///
-```
-
+///
+```
+
## Asymmetric matchers
All matchers described in the API are also asymmetrical since [jest version 23](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing#custom-asymmetric-matchers):
@@ -187,7 +187,6 @@ test('passes when using an asymmetrical matcher', () => {
#### .pass(message)
-
Passing assertion.
```js
@@ -196,7 +195,6 @@ expect().pass('should pass');
#### .fail(message)
-
Failing assertion.
```js
@@ -303,9 +301,7 @@ Use `.toIncludeAllPartialMembers` when checking if an `Array` contains all of th
```js
test('passes when given array values match the partial members of the set', () => {
- expect([{ foo: 'bar', baz: 'qux' }]).toIncludeAllPartialMembers([
- { foo: 'bar' },
- ]);
+ expect([{ foo: 'bar', baz: 'qux' }]).toIncludeAllPartialMembers([{ foo: 'bar' }]);
});
```
@@ -351,8 +347,8 @@ Use `.toSatisfyAny` when you want to use a custom matcher by supplying a predica
```js
test('passes when any value in array pass given predicate', () => {
const isOdd = el => el % 2 === 1;
- expect([2,3,6,8]).toSatisfyAny(isOdd);
- expect([2,4,8,12]).not.toSatisfyAny(isOdd);
+ expect([2, 3, 6, 8]).toSatisfyAny(isOdd);
+ expect([2, 4, 8, 12]).not.toSatisfyAny(isOdd);
});
```
diff --git a/src/matchers/fail/index.js b/src/matchers/fail/index.js
index a71b9952..64dc56ba 100644
--- a/src/matchers/fail/index.js
+++ b/src/matchers/fail/index.js
@@ -5,6 +5,6 @@ const failMessage = message => {
else return () => 'fails by .fail() assertion';
};
-export default {
- fail: (expected, message) => ({ pass: predicate(), message: failMessage(message) }),
-};
+export function fail(expected, message) {
+ return { pass: predicate(), message: failMessage(message) };
+}
diff --git a/src/matchers/fail/index.test.js b/src/matchers/fail/index.test.js
index 03d51bc8..4e4257b0 100644
--- a/src/matchers/fail/index.test.js
+++ b/src/matchers/fail/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/index.js b/src/matchers/index.js
index 7d15a604..dedb405b 100644
--- a/src/matchers/index.js
+++ b/src/matchers/index.js
@@ -1,131 +1,64 @@
-import failMatcher from './fail';
-import passMatcher from './pass';
-import toBeAfterMatcher from './toBeAfter';
-import toBeArrayMatcher from './toBeArray';
-import toBeArrayOfSizeMatcher from './toBeArrayOfSize';
-import toBeBeforeMatcher from './toBeBefore';
-import toBeBooleanMatcher from './toBeBoolean';
-import toBeDateMatcher from './toBeDate';
-import toBeDateStringMatcher from './toBeDateString';
-import toBeEmptyMatcher from './toBeEmpty';
-import toBeEmptyObjectMatcher from './toBeEmptyObject';
-import toBeEvenMatcher from './toBeEven';
-import toBeExtensibleMatcher from './toBeExtensible';
-import toBeFalseMatcher from './toBeFalse';
-import toBeFiniteMatcher from './toBeFinite';
-import toBeFrozenMatcher from './toBeFrozen';
-import toBeFunctionMatcher from './toBeFunction';
-import toBeHexadecimalMatcher from './toBeHexadecimal';
-import toBeIntegerMatcher from './toBeInteger';
-import toBeNaNMatcher from './toBeNaN';
-import toBeNegativeMatcher from './toBeNegative';
-import toBeNilMatcher from './toBeNil';
-import toBeNumberMatcher from './toBeNumber';
-import toBeObjectMatcher from './toBeObject';
-import toBeOddMatcher from './toBeOdd';
-import toBeOneOfMatcher from './toBeOneOf';
-import toBePositiveMatcher from './toBePositive';
-import toBeSealedMatcher from './toBeSealed';
-import toBeStringMatcher from './toBeString';
-import toBeSymbolMatcher from './toBeSymbol';
-import toBeTrueMatcher from './toBeTrue';
-import toBeValidDateMatcher from './toBeValidDate';
-import toBeWithinMatcher from './toBeWithin';
-import toContainAllEntriesMatcher from './toContainAllEntries';
-import toContainAllKeysMatcher from './toContainAllKeys';
-import toContainAllValuesMatcher from './toContainAllValues';
-import toContainAnyEntriesMatcher from './toContainAnyEntries';
-import toContainAnyKeysMatcher from './toContainAnyKeys';
-import toContainAnyValuesMatcher from './toContainAnyValues';
-import toContainEntriesMatcher from './toContainEntries';
-import toContainEntryMatcher from './toContainEntry';
-import toContainKeyMatcher from './toContainKey';
-import toContainKeysMatcher from './toContainKeys';
-import toContainValueMatcher from './toContainValue';
-import toContainValuesMatcher from './toContainValues';
-import toEndWithMatcher from './toEndWith';
-import toEqualCaseInsensitiveMatcher from './toEqualCaseInsensitive';
-import toHaveBeenCalledAfterMatcher from './toHaveBeenCalledAfter';
-import toHaveBeenCalledBeforeMatcher from './toHaveBeenCalledBefore';
-import toHaveBeenCalledOnceMatcher from './toHaveBeenCalledOnce';
-import toIncludeMatcher from './toInclude';
-import toIncludeAllMembersMatcher from './toIncludeAllMembers';
-import toIncludeAllPartialMembersMatcher from './toIncludeAllPartialMembers';
-import toIncludeAnyMembersMatcher from './toIncludeAnyMembers';
-import toIncludeMultipleMatcher from './toIncludeMultiple';
-import toIncludeRepeatedMatcher from './toIncludeRepeated';
-import toIncludeSameMembersMatcher from './toIncludeSameMembers';
-import toRejectMatcher from './toReject';
-import toResolveMatcher from './toResolve';
-import toSatisfyMatcher from './toSatisfy';
-import toSatisfyAllMatcher from './toSatisfyAll';
-import toSatisfyAnyMatcher from './toSatisfyAny';
-import toStartWithMatcher from './toStartWith';
-import toThrowWithMessageMatcher from './toThrowWithMessage';
-
-// this is absolutely horrible, but all matchers are default exports of an object with the name of the matcher
-
-export const fail = failMatcher.fail;
-export const pass = passMatcher.pass;
-export const toBeAfter = toBeAfterMatcher.toBeAfter;
-export const toBeArray = toBeArrayMatcher.toBeArray;
-export const toBeArrayOfSize = toBeArrayOfSizeMatcher.toBeArrayOfSize;
-export const toBeBefore = toBeBeforeMatcher.toBeBefore;
-export const toBeBoolean = toBeBooleanMatcher.toBeBoolean;
-export const toBeDate = toBeDateMatcher.toBeDate;
-export const toBeDateString = toBeDateStringMatcher.toBeDateString;
-export const toBeEmpty = toBeEmptyMatcher.toBeEmpty;
-export const toBeEmptyObject = toBeEmptyObjectMatcher.toBeEmptyObject;
-export const toBeEven = toBeEvenMatcher.toBeEven;
-export const toBeExtensible = toBeExtensibleMatcher.toBeExtensible;
-export const toBeFalse = toBeFalseMatcher.toBeFalse;
-export const toBeFinite = toBeFiniteMatcher.toBeFinite;
-export const toBeFrozen = toBeFrozenMatcher.toBeFrozen;
-export const toBeFunction = toBeFunctionMatcher.toBeFunction;
-export const toBeHexadecimal = toBeHexadecimalMatcher.toBeHexadecimal;
-export const toBeInteger = toBeIntegerMatcher.toBeInteger;
-export const toBeNaN = toBeNaNMatcher.toBeNaN;
-export const toBeNegative = toBeNegativeMatcher.toBeNegative;
-export const toBeNil = toBeNilMatcher.toBeNil;
-export const toBeNumber = toBeNumberMatcher.toBeNumber;
-export const toBeObject = toBeObjectMatcher.toBeObject;
-export const toBeOdd = toBeOddMatcher.toBeOdd;
-export const toBeOneOf = toBeOneOfMatcher.toBeOneOf;
-export const toBePositive = toBePositiveMatcher.toBePositive;
-export const toBeSealed = toBeSealedMatcher.toBeSealed;
-export const toBeString = toBeStringMatcher.toBeString;
-export const toBeSymbol = toBeSymbolMatcher.toBeSymbol;
-export const toBeTrue = toBeTrueMatcher.toBeTrue;
-export const toBeValidDate = toBeValidDateMatcher.toBeValidDate;
-export const toBeWithin = toBeWithinMatcher.toBeWithin;
-export const toContainAllEntries = toContainAllEntriesMatcher.toContainAllEntries;
-export const toContainAllKeys = toContainAllKeysMatcher.toContainAllKeys;
-export const toContainAllValues = toContainAllValuesMatcher.toContainAllValues;
-export const toContainAnyEntries = toContainAnyEntriesMatcher.toContainAnyEntries;
-export const toContainAnyKeys = toContainAnyKeysMatcher.toContainAnyKeys;
-export const toContainAnyValues = toContainAnyValuesMatcher.toContainAnyValues;
-export const toContainEntries = toContainEntriesMatcher.toContainEntries;
-export const toContainEntry = toContainEntryMatcher.toContainEntry;
-export const toContainKey = toContainKeyMatcher.toContainKey;
-export const toContainKeys = toContainKeysMatcher.toContainKeys;
-export const toContainValue = toContainValueMatcher.toContainValue;
-export const toContainValues = toContainValuesMatcher.toContainValues;
-export const toEndWith = toEndWithMatcher.toEndWith;
-export const toEqualCaseInsensitive = toEqualCaseInsensitiveMatcher.toEqualCaseInsensitive;
-export const toHaveBeenCalledAfter = toHaveBeenCalledAfterMatcher.toHaveBeenCalledAfter;
-export const toHaveBeenCalledBefore = toHaveBeenCalledBeforeMatcher.toHaveBeenCalledBefore;
-export const toHaveBeenCalledOnce = toHaveBeenCalledOnceMatcher.toHaveBeenCalledOnce;
-export const toInclude = toIncludeMatcher.toInclude;
-export const toIncludeAllMembers = toIncludeAllMembersMatcher.toIncludeAllMembers;
-export const toIncludeAllPartialMembers = toIncludeAllPartialMembersMatcher.toIncludeAllPartialMembers;
-export const toIncludeAnyMembers = toIncludeAnyMembersMatcher.toIncludeAnyMembers;
-export const toIncludeMultiple = toIncludeMultipleMatcher.toIncludeMultiple;
-export const toIncludeRepeated = toIncludeRepeatedMatcher.toIncludeRepeated;
-export const toIncludeSameMembers = toIncludeSameMembersMatcher.toIncludeSameMembers;
-export const toReject = toRejectMatcher.toReject;
-export const toResolve = toResolveMatcher.toResolve;
-export const toSatisfy = toSatisfyMatcher.toSatisfy;
-export const toSatisfyAll = toSatisfyAllMatcher.toSatisfyAll;
-export const toSatisfyAny = toSatisfyAnyMatcher.toSatisfyAny;
-export const toStartWith = toStartWithMatcher.toStartWith;
-export const toThrowWithMessage = toThrowWithMessageMatcher.toThrowWithMessage;
+export { fail } from './fail';
+export { pass } from './pass';
+export { toBeAfter } from './toBeAfter';
+export { toBeArray } from './toBeArray';
+export { toBeArrayOfSize } from './toBeArrayOfSize';
+export { toBeBefore } from './toBeBefore';
+export { toBeBoolean } from './toBeBoolean';
+export { toBeDate } from './toBeDate';
+export { toBeDateString } from './toBeDateString';
+export { toBeEmpty } from './toBeEmpty';
+export { toBeEmptyObject } from './toBeEmptyObject';
+export { toBeEven } from './toBeEven';
+export { toBeExtensible } from './toBeExtensible';
+export { toBeFalse } from './toBeFalse';
+export { toBeFinite } from './toBeFinite';
+export { toBeFrozen } from './toBeFrozen';
+export { toBeFunction } from './toBeFunction';
+export { toBeHexadecimal } from './toBeHexadecimal';
+export { toBeInteger } from './toBeInteger';
+export { toBeNaN } from './toBeNaN';
+export { toBeNegative } from './toBeNegative';
+export { toBeNil } from './toBeNil';
+export { toBeNumber } from './toBeNumber';
+export { toBeObject } from './toBeObject';
+export { toBeOdd } from './toBeOdd';
+export { toBeOneOf } from './toBeOneOf';
+export { toBePositive } from './toBePositive';
+export { toBeSealed } from './toBeSealed';
+export { toBeString } from './toBeString';
+export { toBeSymbol } from './toBeSymbol';
+export { toBeTrue } from './toBeTrue';
+export { toBeValidDate } from './toBeValidDate';
+export { toBeWithin } from './toBeWithin';
+export { toContainAllEntries } from './toContainAllEntries';
+export { toContainAllKeys } from './toContainAllKeys';
+export { toContainAllValues } from './toContainAllValues';
+export { toContainAnyEntries } from './toContainAnyEntries';
+export { toContainAnyKeys } from './toContainAnyKeys';
+export { toContainAnyValues } from './toContainAnyValues';
+export { toContainEntries } from './toContainEntries';
+export { toContainEntry } from './toContainEntry';
+export { toContainKey } from './toContainKey';
+export { toContainKeys } from './toContainKeys';
+export { toContainValue } from './toContainValue';
+export { toContainValues } from './toContainValues';
+export { toEndWith } from './toEndWith';
+export { toEqualCaseInsensitive } from './toEqualCaseInsensitive';
+export { toHaveBeenCalledAfter } from './toHaveBeenCalledAfter';
+export { toHaveBeenCalledBefore } from './toHaveBeenCalledBefore';
+export { toHaveBeenCalledOnce } from './toHaveBeenCalledOnce';
+export { toInclude } from './toInclude';
+export { toIncludeAllMembers } from './toIncludeAllMembers';
+export { toIncludeAllPartialMembers } from './toIncludeAllPartialMembers';
+export { toIncludeAnyMembers } from './toIncludeAnyMembers';
+export { toIncludeMultiple } from './toIncludeMultiple';
+export { toIncludeRepeated } from './toIncludeRepeated';
+export { toIncludeSameMembers } from './toIncludeSameMembers';
+export { toReject } from './toReject';
+export { toResolve } from './toResolve';
+export { toSatisfy } from './toSatisfy';
+export { toSatisfyAll } from './toSatisfyAll';
+export { toSatisfyAny } from './toSatisfyAny';
+export { toStartWith } from './toStartWith';
+export { toThrowWithMessage } from './toThrowWithMessage';
diff --git a/src/matchers/index.test.js b/src/matchers/index.test.js
index a538ef78..e3f7ab0b 100644
--- a/src/matchers/index.test.js
+++ b/src/matchers/index.test.js
@@ -48,8 +48,15 @@ describe('asymmetric matchers', () => {
describe('all matchers', () => {
test('must be exported', () => {
const directories = fs.readdirSync(__dirname).filter(dir => fs.statSync(path.join(__dirname, dir)).isDirectory());
+ const namedMatchers = Object.keys(matchers);
- expect(Object.keys(matchers)).toHaveLength(directories.length);
+ try {
+ expect(namedMatchers).toHaveLength(directories.length);
+ } catch (error) {
+ const missing = new Set(directories.filter(dir => !namedMatchers.includes(dir)));
+ console.error('Missing', missing);
+ throw error;
+ }
});
describe('must be functions', () => {
diff --git a/src/matchers/pass/index.js b/src/matchers/pass/index.js
index ca3ac41b..1d48865e 100644
--- a/src/matchers/pass/index.js
+++ b/src/matchers/pass/index.js
@@ -5,6 +5,6 @@ const passMessage = message => {
else return () => 'passes by .pass() assertion';
};
-export default {
- pass: (expected, message) => ({ pass: predicate(), message: passMessage(message) }),
-};
+export function pass(expected, message) {
+ return { pass: predicate(), message: passMessage(message) };
+}
diff --git a/src/matchers/pass/index.test.js b/src/matchers/pass/index.test.js
index bcde408a..28e8e064 100644
--- a/src/matchers/pass/index.test.js
+++ b/src/matchers/pass/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeAfter/index.js b/src/matchers/toBeAfter/index.js
index e4ea6e8d..4f280986 100644
--- a/src/matchers/toBeAfter/index.js
+++ b/src/matchers/toBeAfter/index.js
@@ -14,13 +14,11 @@ const failMessage = (received, after) => () =>
`Expected date to be after ${printReceived(after)} but received:\n` +
` ${printReceived(received)}`;
-export default {
- toBeAfter: (date, after) => {
- const pass = predicate(date, after);
- if (pass) {
- return { pass: true, message: passMessage(date, after) };
- }
+export function toBeAfter(date, after) {
+ const pass = predicate(date, after);
+ if (pass) {
+ return { pass: true, message: passMessage(date, after) };
+ }
- return { pass: false, message: failMessage(date, after) };
- },
-};
+ return { pass: false, message: failMessage(date, after) };
+}
diff --git a/src/matchers/toBeAfter/index.test.js b/src/matchers/toBeAfter/index.test.js
index f5f0adb1..0fb69fc7 100644
--- a/src/matchers/toBeAfter/index.test.js
+++ b/src/matchers/toBeAfter/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeArray/index.js b/src/matchers/toBeArray/index.js
index 333283ed..09ac463d 100644
--- a/src/matchers/toBeArray/index.js
+++ b/src/matchers/toBeArray/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be an array received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeArray: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeArray(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeArray/index.test.js b/src/matchers/toBeArray/index.test.js
index a81aadd2..ae9494b6 100644
--- a/src/matchers/toBeArray/index.test.js
+++ b/src/matchers/toBeArray/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeArrayOfSize/index.js b/src/matchers/toBeArrayOfSize/index.js
index 263e6728..b0f27f4e 100644
--- a/src/matchers/toBeArrayOfSize/index.js
+++ b/src/matchers/toBeArrayOfSize/index.js
@@ -21,13 +21,11 @@ Received:
value: ${printReceived(actual)}
length: ${printReceived(determinePropertyMessage(actual, 'length'))}`;
-export default {
- toBeArrayOfSize: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toBeArrayOfSize(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toBeArrayOfSize/index.test.js b/src/matchers/toBeArrayOfSize/index.test.js
index 93ec11f3..14719760 100644
--- a/src/matchers/toBeArrayOfSize/index.test.js
+++ b/src/matchers/toBeArrayOfSize/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeBefore/index.js b/src/matchers/toBeBefore/index.js
index bc7a4d65..f5a6aabb 100644
--- a/src/matchers/toBeBefore/index.js
+++ b/src/matchers/toBeBefore/index.js
@@ -14,13 +14,11 @@ const failMessage = (received, before) => () =>
`Expected date to be before ${printReceived(before)} but received:\n` +
` ${printReceived(received)}`;
-export default {
- toBeBefore: (date, before) => {
- const pass = predicate(date, before);
- if (pass) {
- return { pass: true, message: passMessage(date, before) };
- }
+export function toBeBefore(date, before) {
+ const pass = predicate(date, before);
+ if (pass) {
+ return { pass: true, message: passMessage(date, before) };
+ }
- return { pass: false, message: failMessage(date, before) };
- },
-};
+ return { pass: false, message: failMessage(date, before) };
+}
diff --git a/src/matchers/toBeBefore/index.test.js b/src/matchers/toBeBefore/index.test.js
index 244880f9..3dee8923 100644
--- a/src/matchers/toBeBefore/index.test.js
+++ b/src/matchers/toBeBefore/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeBoolean/index.js b/src/matchers/toBeBoolean/index.js
index a5e85f23..b2043225 100644
--- a/src/matchers/toBeBoolean/index.js
+++ b/src/matchers/toBeBoolean/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be of type boolean, received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeBoolean: received => {
- const pass = predicate(received);
- if (pass) {
- return { pass: true, message: passMessage(received) };
- }
+export function toBeBoolean(received) {
+ const pass = predicate(received);
+ if (pass) {
+ return { pass: true, message: passMessage(received) };
+ }
- return { pass: false, message: failMessage(received) };
- },
-};
+ return { pass: false, message: failMessage(received) };
+}
diff --git a/src/matchers/toBeBoolean/index.test.js b/src/matchers/toBeBoolean/index.test.js
index 024d4118..8e3cd9d2 100644
--- a/src/matchers/toBeBoolean/index.test.js
+++ b/src/matchers/toBeBoolean/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeDate/index.js b/src/matchers/toBeDate/index.js
index f60eedd7..99def7b6 100644
--- a/src/matchers/toBeDate/index.js
+++ b/src/matchers/toBeDate/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be a date received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeDate: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeDate(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeDate/index.test.js b/src/matchers/toBeDate/index.test.js
index 07c2d52f..42f15b68 100644
--- a/src/matchers/toBeDate/index.test.js
+++ b/src/matchers/toBeDate/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeDateString/index.js b/src/matchers/toBeDateString/index.js
index 3c1e8dec..8611bd0f 100644
--- a/src/matchers/toBeDateString/index.js
+++ b/src/matchers/toBeDateString/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be a date string received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeDateString: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeDateString(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeDateString/index.test.js b/src/matchers/toBeDateString/index.test.js
index 3bdeda88..6afc1468 100644
--- a/src/matchers/toBeDateString/index.test.js
+++ b/src/matchers/toBeDateString/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeEmpty/index.js b/src/matchers/toBeEmpty/index.js
index 7eda9624..2a8fa11c 100644
--- a/src/matchers/toBeEmpty/index.js
+++ b/src/matchers/toBeEmpty/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be empty received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeEmpty: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeEmpty(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeEmpty/index.test.js b/src/matchers/toBeEmpty/index.test.js
index 964ad471..6566fe50 100644
--- a/src/matchers/toBeEmpty/index.test.js
+++ b/src/matchers/toBeEmpty/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeEmptyObject/index.js b/src/matchers/toBeEmptyObject/index.js
index f18ef170..a96caf87 100644
--- a/src/matchers/toBeEmptyObject/index.js
+++ b/src/matchers/toBeEmptyObject/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be an empty object, received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeEmptyObject: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeEmptyObject(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeEmptyObject/index.test.js b/src/matchers/toBeEmptyObject/index.test.js
index ffeb46ef..5e55adfc 100644
--- a/src/matchers/toBeEmptyObject/index.test.js
+++ b/src/matchers/toBeEmptyObject/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeEven/index.js b/src/matchers/toBeEven/index.js
index a87d499d..f3a40de5 100644
--- a/src/matchers/toBeEven/index.js
+++ b/src/matchers/toBeEven/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be an even number received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeEven: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeEven(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeEven/index.test.js b/src/matchers/toBeEven/index.test.js
index 181edf62..a96cdb02 100644
--- a/src/matchers/toBeEven/index.test.js
+++ b/src/matchers/toBeEven/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeExtensible/index.js b/src/matchers/toBeExtensible/index.js
index eb8ee0c9..c4f864dd 100644
--- a/src/matchers/toBeExtensible/index.js
+++ b/src/matchers/toBeExtensible/index.js
@@ -20,12 +20,10 @@ const failMessage = received => () => {
);
};
-export default {
- toBeExtensible(expected) {
- const pass = predicate(expected);
- return {
- pass,
- message: pass ? passMessage(expected) : failMessage(expected),
- };
- },
-};
+export function toBeExtensible(expected) {
+ const pass = predicate(expected);
+ return {
+ pass,
+ message: pass ? passMessage(expected) : failMessage(expected),
+ };
+}
diff --git a/src/matchers/toBeExtensible/index.test.js b/src/matchers/toBeExtensible/index.test.js
index ac99d2e2..ee29de4b 100644
--- a/src/matchers/toBeExtensible/index.test.js
+++ b/src/matchers/toBeExtensible/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeFalse/index.js b/src/matchers/toBeFalse/index.js
index 310e095c..792ac27f 100644
--- a/src/matchers/toBeFalse/index.js
+++ b/src/matchers/toBeFalse/index.js
@@ -16,13 +16,11 @@ const failMessage = received => () =>
'Received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeFalse: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeFalse(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeFalse/index.test.js b/src/matchers/toBeFalse/index.test.js
index 3e400ee5..0b0d6bcd 100644
--- a/src/matchers/toBeFalse/index.test.js
+++ b/src/matchers/toBeFalse/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeFinite/index.js b/src/matchers/toBeFinite/index.js
index fbc5eeed..2e69b3ff 100644
--- a/src/matchers/toBeFinite/index.js
+++ b/src/matchers/toBeFinite/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be finite received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeFinite: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeFinite(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeFinite/index.test.js b/src/matchers/toBeFinite/index.test.js
index 054ebc33..e04717dc 100644
--- a/src/matchers/toBeFinite/index.test.js
+++ b/src/matchers/toBeFinite/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeFrozen/index.js b/src/matchers/toBeFrozen/index.js
index e855db9a..5d8581d6 100644
--- a/src/matchers/toBeFrozen/index.js
+++ b/src/matchers/toBeFrozen/index.js
@@ -6,13 +6,11 @@ const passMessage = () => matcherHint('.not.toBeFrozen', 'received', '') + '\n\n
const failMessage = () => matcherHint('.toBeFrozen', 'received', '') + '\n\n' + 'Expected object to be frozen';
-export default {
- toBeFrozen: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage };
- }
+export function toBeFrozen(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage };
+ }
- return { pass: false, message: failMessage };
- },
-};
+ return { pass: false, message: failMessage };
+}
diff --git a/src/matchers/toBeFrozen/index.test.js b/src/matchers/toBeFrozen/index.test.js
index b065979d..01c10fc8 100644
--- a/src/matchers/toBeFrozen/index.test.js
+++ b/src/matchers/toBeFrozen/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeFunction/index.js b/src/matchers/toBeFunction/index.js
index c2e588d2..b895e7be 100644
--- a/src/matchers/toBeFunction/index.js
+++ b/src/matchers/toBeFunction/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected to receive a function, received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeFunction: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeFunction(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeFunction/index.test.js b/src/matchers/toBeFunction/index.test.js
index 2aaf1dad..5b9ec560 100644
--- a/src/matchers/toBeFunction/index.test.js
+++ b/src/matchers/toBeFunction/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeHexadecimal/index.js b/src/matchers/toBeHexadecimal/index.js
index b023a98d..d8dc014a 100644
--- a/src/matchers/toBeHexadecimal/index.js
+++ b/src/matchers/toBeHexadecimal/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be a hexadecimal, received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeHexadecimal: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeHexadecimal(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeHexadecimal/index.test.js b/src/matchers/toBeHexadecimal/index.test.js
index 5dedc613..34b055b7 100644
--- a/src/matchers/toBeHexadecimal/index.test.js
+++ b/src/matchers/toBeHexadecimal/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeInteger/index.js b/src/matchers/toBeInteger/index.js
index c2932622..364c0a0a 100644
--- a/src/matchers/toBeInteger/index.js
+++ b/src/matchers/toBeInteger/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be an integer received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeInteger: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeInteger(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeInteger/index.test.js b/src/matchers/toBeInteger/index.test.js
index 264ce848..903e2b7e 100644
--- a/src/matchers/toBeInteger/index.test.js
+++ b/src/matchers/toBeInteger/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeNaN/index.js b/src/matchers/toBeNaN/index.js
index 761cb8ef..67d27d9e 100644
--- a/src/matchers/toBeNaN/index.js
+++ b/src/matchers/toBeNaN/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to not be a number received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeNaN: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeNaN(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeNaN/index.test.js b/src/matchers/toBeNaN/index.test.js
index d2b301f2..bb1233cd 100644
--- a/src/matchers/toBeNaN/index.test.js
+++ b/src/matchers/toBeNaN/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeNegative/index.js b/src/matchers/toBeNegative/index.js
index aff7e39c..130323af 100644
--- a/src/matchers/toBeNegative/index.js
+++ b/src/matchers/toBeNegative/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be a negative number received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeNegative: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeNegative(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeNegative/index.test.js b/src/matchers/toBeNegative/index.test.js
index 6d3e917a..0773afe5 100644
--- a/src/matchers/toBeNegative/index.test.js
+++ b/src/matchers/toBeNegative/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeNil/index.js b/src/matchers/toBeNil/index.js
index 2032e963..21adfafd 100644
--- a/src/matchers/toBeNil/index.js
+++ b/src/matchers/toBeNil/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be null or undefined, received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeNil: received => {
- const pass = predicate(received);
- if (pass) {
- return { pass: true, message: passMessage(received) };
- }
+export function toBeNil(received) {
+ const pass = predicate(received);
+ if (pass) {
+ return { pass: true, message: passMessage(received) };
+ }
- return { pass: false, message: failMessage(received) };
- },
-};
+ return { pass: false, message: failMessage(received) };
+}
diff --git a/src/matchers/toBeNil/index.test.js b/src/matchers/toBeNil/index.test.js
index 85ebcd58..15f07ddc 100644
--- a/src/matchers/toBeNil/index.test.js
+++ b/src/matchers/toBeNil/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeNumber/index.js b/src/matchers/toBeNumber/index.js
index d67f8eb1..79ca6ad4 100644
--- a/src/matchers/toBeNumber/index.js
+++ b/src/matchers/toBeNumber/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be a number received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeNumber: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeNumber(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeNumber/index.test.js b/src/matchers/toBeNumber/index.test.js
index 1eac9d36..67dc0e15 100644
--- a/src/matchers/toBeNumber/index.test.js
+++ b/src/matchers/toBeNumber/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeObject/index.js b/src/matchers/toBeObject/index.js
index 615da25b..f756b1b1 100644
--- a/src/matchers/toBeObject/index.js
+++ b/src/matchers/toBeObject/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be an object, received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeObject: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeObject(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeObject/index.test.js b/src/matchers/toBeObject/index.test.js
index 95bee9e2..ef7fb954 100644
--- a/src/matchers/toBeObject/index.test.js
+++ b/src/matchers/toBeObject/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeOdd/index.js b/src/matchers/toBeOdd/index.js
index 424f11f7..44515a50 100644
--- a/src/matchers/toBeOdd/index.js
+++ b/src/matchers/toBeOdd/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be odd received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeOdd: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeOdd(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeOdd/index.test.js b/src/matchers/toBeOdd/index.test.js
index ada4a169..4177cd1e 100644
--- a/src/matchers/toBeOdd/index.test.js
+++ b/src/matchers/toBeOdd/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeOneOf/index.js b/src/matchers/toBeOneOf/index.js
index cc584515..8dd0bf73 100644
--- a/src/matchers/toBeOneOf/index.js
+++ b/src/matchers/toBeOneOf/index.js
@@ -18,13 +18,11 @@ const failMessage = (item, list) => () =>
'Received:\n' +
` ${printReceived(item)}`;
-export default {
- toBeOneOf: (item, list) => {
- const pass = predicate(item, list);
- if (pass) {
- return { pass: true, message: passMessage(item, list) };
- }
+export function toBeOneOf(item, list) {
+ const pass = predicate(item, list);
+ if (pass) {
+ return { pass: true, message: passMessage(item, list) };
+ }
- return { pass: false, message: failMessage(item, list) };
- },
-};
+ return { pass: false, message: failMessage(item, list) };
+}
diff --git a/src/matchers/toBeOneOf/index.test.js b/src/matchers/toBeOneOf/index.test.js
index 134f6060..f1c93aba 100644
--- a/src/matchers/toBeOneOf/index.test.js
+++ b/src/matchers/toBeOneOf/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBePositive/index.js b/src/matchers/toBePositive/index.js
index dc5c8f5b..96dcfb61 100644
--- a/src/matchers/toBePositive/index.js
+++ b/src/matchers/toBePositive/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be positive received:\n' +
` ${printReceived(received)}`;
-export default {
- toBePositive: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBePositive(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBePositive/index.test.js b/src/matchers/toBePositive/index.test.js
index 35e9bd3f..ce962e37 100644
--- a/src/matchers/toBePositive/index.test.js
+++ b/src/matchers/toBePositive/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeSealed/index.js b/src/matchers/toBeSealed/index.js
index def71d26..317bf072 100644
--- a/src/matchers/toBeSealed/index.js
+++ b/src/matchers/toBeSealed/index.js
@@ -6,13 +6,11 @@ const passMessage = () => () => matcherHint('.not.toBeSealed', 'received', '') +
const failMessage = () => () => matcherHint('.toBeSealed', 'received', '') + '\n\nExpected object to not sealed';
-export default {
- toBeSealed: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage() };
- }
+export function toBeSealed(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage() };
+ }
- return { pass: false, message: failMessage() };
- },
-};
+ return { pass: false, message: failMessage() };
+}
diff --git a/src/matchers/toBeSealed/index.test.js b/src/matchers/toBeSealed/index.test.js
index a02c1167..f05e27d4 100644
--- a/src/matchers/toBeSealed/index.test.js
+++ b/src/matchers/toBeSealed/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeString/index.js b/src/matchers/toBeString/index.js
index d2af1080..125f9bb7 100644
--- a/src/matchers/toBeString/index.js
+++ b/src/matchers/toBeString/index.js
@@ -16,13 +16,11 @@ const failMessage = received => () =>
'Received:\n' +
` ${printReceived(typeof received)}`;
-export default {
- toBeString: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeString(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeString/index.test.js b/src/matchers/toBeString/index.test.js
index 37680718..34bb4740 100644
--- a/src/matchers/toBeString/index.test.js
+++ b/src/matchers/toBeString/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeSymbol/index.js b/src/matchers/toBeSymbol/index.js
index 2b8c58f4..dab36679 100644
--- a/src/matchers/toBeSymbol/index.js
+++ b/src/matchers/toBeSymbol/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected to receive a symbol, received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeSymbol: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeSymbol(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeSymbol/index.test.js b/src/matchers/toBeSymbol/index.test.js
index 884f71b6..febc1c61 100644
--- a/src/matchers/toBeSymbol/index.test.js
+++ b/src/matchers/toBeSymbol/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeTrue/index.js b/src/matchers/toBeTrue/index.js
index fc9957b8..b330c817 100644
--- a/src/matchers/toBeTrue/index.js
+++ b/src/matchers/toBeTrue/index.js
@@ -16,13 +16,11 @@ const failMessage = received => () =>
'Received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeTrue: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeTrue(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeTrue/index.test.js b/src/matchers/toBeTrue/index.test.js
index dc9b32c8..8c43826d 100644
--- a/src/matchers/toBeTrue/index.test.js
+++ b/src/matchers/toBeTrue/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeValidDate/index.js b/src/matchers/toBeValidDate/index.js
index eab21ad4..a30f94c8 100644
--- a/src/matchers/toBeValidDate/index.js
+++ b/src/matchers/toBeValidDate/index.js
@@ -14,13 +14,11 @@ const failMessage = received => () =>
'Expected value to be a valid date received:\n' +
` ${printReceived(received)}`;
-export default {
- toBeValidDate: expected => {
- const pass = predicate(expected);
- if (pass) {
- return { pass: true, message: passMessage(expected) };
- }
+export function toBeValidDate(expected) {
+ const pass = predicate(expected);
+ if (pass) {
+ return { pass: true, message: passMessage(expected) };
+ }
- return { pass: false, message: failMessage(expected) };
- },
-};
+ return { pass: false, message: failMessage(expected) };
+}
diff --git a/src/matchers/toBeValidDate/index.test.js b/src/matchers/toBeValidDate/index.test.js
index 26fdd7de..9d4ac245 100644
--- a/src/matchers/toBeValidDate/index.test.js
+++ b/src/matchers/toBeValidDate/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toBeWithin/index.js b/src/matchers/toBeWithin/index.js
index 657525c6..5ab43ad4 100644
--- a/src/matchers/toBeWithin/index.js
+++ b/src/matchers/toBeWithin/index.js
@@ -18,13 +18,11 @@ const failMessage = (number, start, end) => () =>
'Received:\n' +
` ${printReceived(number)}`;
-export default {
- toBeWithin: (number, start, end) => {
- const pass = predicate(number, start, end);
- if (pass) {
- return { pass: true, message: passMessage(number, start, end) };
- }
+export function toBeWithin(number, start, end) {
+ const pass = predicate(number, start, end);
+ if (pass) {
+ return { pass: true, message: passMessage(number, start, end) };
+ }
- return { pass: false, message: failMessage(number, start, end) };
- },
-};
+ return { pass: false, message: failMessage(number, start, end) };
+}
diff --git a/src/matchers/toBeWithin/index.test.js b/src/matchers/toBeWithin/index.test.js
index 3d90dff9..ac3d6619 100644
--- a/src/matchers/toBeWithin/index.test.js
+++ b/src/matchers/toBeWithin/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainAllEntries/index.js b/src/matchers/toContainAllEntries/index.js
index cfc92697..0655f6fa 100644
--- a/src/matchers/toContainAllEntries/index.js
+++ b/src/matchers/toContainAllEntries/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainAllEntries: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainAllEntries(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainAllEntries/index.test.js b/src/matchers/toContainAllEntries/index.test.js
index f81906e1..5ef2ebf0 100644
--- a/src/matchers/toContainAllEntries/index.test.js
+++ b/src/matchers/toContainAllEntries/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainAllKeys/index.js b/src/matchers/toContainAllKeys/index.js
index a3ba9304..a1806cd8 100644
--- a/src/matchers/toContainAllKeys/index.js
+++ b/src/matchers/toContainAllKeys/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(Object.keys(actual))}`;
-export default {
- toContainAllKeys: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainAllKeys(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainAllKeys/index.test.js b/src/matchers/toContainAllKeys/index.test.js
index 83d6101e..81099a9e 100644
--- a/src/matchers/toContainAllKeys/index.test.js
+++ b/src/matchers/toContainAllKeys/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainAllValues/index.js b/src/matchers/toContainAllValues/index.js
index 5f716261..ca480c76 100644
--- a/src/matchers/toContainAllValues/index.js
+++ b/src/matchers/toContainAllValues/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainAllValues: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainAllValues(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainAllValues/index.test.js b/src/matchers/toContainAllValues/index.test.js
index cb640aaf..3fe695eb 100644
--- a/src/matchers/toContainAllValues/index.test.js
+++ b/src/matchers/toContainAllValues/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainAnyEntries/index.js b/src/matchers/toContainAnyEntries/index.js
index 8a30b1ed..a51307e1 100644
--- a/src/matchers/toContainAnyEntries/index.js
+++ b/src/matchers/toContainAnyEntries/index.js
@@ -18,12 +18,10 @@ const failMessage = (object, entries) => () =>
'Received:\n' +
` ${printReceived(object)}`;
-export default {
- toContainAnyEntries: (object, entries) => {
- const pass = predicate(object, entries);
- if (pass) {
- return { pass: true, message: passMessage(object, entries) };
- }
- return { pass: false, message: failMessage(object, entries) };
- },
-};
+export function toContainAnyEntries(object, entries) {
+ const pass = predicate(object, entries);
+ if (pass) {
+ return { pass: true, message: passMessage(object, entries) };
+ }
+ return { pass: false, message: failMessage(object, entries) };
+}
diff --git a/src/matchers/toContainAnyEntries/index.test.js b/src/matchers/toContainAnyEntries/index.test.js
index 8e03e93e..88db18e8 100644
--- a/src/matchers/toContainAnyEntries/index.test.js
+++ b/src/matchers/toContainAnyEntries/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainAnyKeys/index.js b/src/matchers/toContainAnyKeys/index.js
index 02eb34d3..a3466cd0 100644
--- a/src/matchers/toContainAnyKeys/index.js
+++ b/src/matchers/toContainAnyKeys/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainAnyKeys: (actual, expected) => {
- const pass = predicate(actual, expected);
+export function toContainAnyKeys(actual, expected) {
+ const pass = predicate(actual, expected);
- return {
- pass: pass,
- message: pass ? passMessage(actual, expected) : failMessage(actual, expected),
- };
- },
-};
+ return {
+ pass: pass,
+ message: pass ? passMessage(actual, expected) : failMessage(actual, expected),
+ };
+}
diff --git a/src/matchers/toContainAnyKeys/index.test.js b/src/matchers/toContainAnyKeys/index.test.js
index 95d8d59d..71d72e8f 100644
--- a/src/matchers/toContainAnyKeys/index.test.js
+++ b/src/matchers/toContainAnyKeys/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainAnyValues/index.js b/src/matchers/toContainAnyValues/index.js
index d75ff4d8..131dd5c0 100644
--- a/src/matchers/toContainAnyValues/index.js
+++ b/src/matchers/toContainAnyValues/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainAnyValues: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainAnyValues(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainAnyValues/index.test.js b/src/matchers/toContainAnyValues/index.test.js
index f8e9c07c..faaf3d81 100644
--- a/src/matchers/toContainAnyValues/index.test.js
+++ b/src/matchers/toContainAnyValues/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainEntries/index.js b/src/matchers/toContainEntries/index.js
index 9dec6886..00e9137c 100644
--- a/src/matchers/toContainEntries/index.js
+++ b/src/matchers/toContainEntries/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainEntries: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainEntries(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainEntries/index.test.js b/src/matchers/toContainEntries/index.test.js
index 12a702fc..391854ee 100644
--- a/src/matchers/toContainEntries/index.test.js
+++ b/src/matchers/toContainEntries/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainEntry/index.js b/src/matchers/toContainEntry/index.js
index 73486929..fb4fab5c 100644
--- a/src/matchers/toContainEntry/index.js
+++ b/src/matchers/toContainEntry/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainEntry: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainEntry(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainEntry/index.test.js b/src/matchers/toContainEntry/index.test.js
index 921dc232..449b4d45 100644
--- a/src/matchers/toContainEntry/index.test.js
+++ b/src/matchers/toContainEntry/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainKey/index.js b/src/matchers/toContainKey/index.js
index dfd4bcef..6aabd715 100644
--- a/src/matchers/toContainKey/index.js
+++ b/src/matchers/toContainKey/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainKey: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainKey(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainKey/index.test.js b/src/matchers/toContainKey/index.test.js
index 288dba3f..5e71b27d 100644
--- a/src/matchers/toContainKey/index.test.js
+++ b/src/matchers/toContainKey/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainKeys/index.js b/src/matchers/toContainKeys/index.js
index c0e547d7..cb527ce1 100644
--- a/src/matchers/toContainKeys/index.js
+++ b/src/matchers/toContainKeys/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainKeys: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainKeys(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainKeys/index.test.js b/src/matchers/toContainKeys/index.test.js
index e2b5c16e..e3b8e1a5 100644
--- a/src/matchers/toContainKeys/index.test.js
+++ b/src/matchers/toContainKeys/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainValue/index.js b/src/matchers/toContainValue/index.js
index 9078a00d..02d37a08 100644
--- a/src/matchers/toContainValue/index.js
+++ b/src/matchers/toContainValue/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainValue: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainValue(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainValue/index.test.js b/src/matchers/toContainValue/index.test.js
index 0c41fc74..cf682d36 100644
--- a/src/matchers/toContainValue/index.test.js
+++ b/src/matchers/toContainValue/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toContainValues/index.js b/src/matchers/toContainValues/index.js
index ebc0b956..ad46f78b 100644
--- a/src/matchers/toContainValues/index.js
+++ b/src/matchers/toContainValues/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toContainValues: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toContainValues(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toContainValues/index.test.js b/src/matchers/toContainValues/index.test.js
index beafccbb..553195c8 100644
--- a/src/matchers/toContainValues/index.test.js
+++ b/src/matchers/toContainValues/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toEndWith/index.js b/src/matchers/toEndWith/index.js
index 7d35aa3f..ade547f0 100644
--- a/src/matchers/toEndWith/index.js
+++ b/src/matchers/toEndWith/index.js
@@ -18,13 +18,11 @@ const failMessage = (suffix, string) => () =>
'Received:\n' +
` ${printReceived(string)}`;
-export default {
- toEndWith: (string, suffix) => {
- const pass = predicate(suffix, string);
- if (pass) {
- return { pass: true, message: passMessage(suffix, string) };
- }
+export function toEndWith(string, suffix) {
+ const pass = predicate(suffix, string);
+ if (pass) {
+ return { pass: true, message: passMessage(suffix, string) };
+ }
- return { pass: false, message: failMessage(suffix, string) };
- },
-};
+ return { pass: false, message: failMessage(suffix, string) };
+}
diff --git a/src/matchers/toEndWith/index.test.js b/src/matchers/toEndWith/index.test.js
index 0619e49e..2f5366e5 100644
--- a/src/matchers/toEndWith/index.test.js
+++ b/src/matchers/toEndWith/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toEqualCaseInsensitive/index.js b/src/matchers/toEqualCaseInsensitive/index.js
index 6a978f8c..4906d3d0 100644
--- a/src/matchers/toEqualCaseInsensitive/index.js
+++ b/src/matchers/toEqualCaseInsensitive/index.js
@@ -23,14 +23,12 @@ const failMessage = (received, expected) => () => {
);
};
-export default {
- toEqualCaseInsensitive(received, expected) {
- const pass = predicate(received, expected);
+export function toEqualCaseInsensitive(received, expected) {
+ const pass = predicate(received, expected);
- return {
- pass,
- message: pass ? passMessage(received, expected) : failMessage(received, expected),
- actual: received,
- };
- },
-};
+ return {
+ pass,
+ message: pass ? passMessage(received, expected) : failMessage(received, expected),
+ actual: received,
+ };
+}
diff --git a/src/matchers/toEqualCaseInsensitive/index.test.js b/src/matchers/toEqualCaseInsensitive/index.test.js
index 263f6f35..a9e0fa5f 100644
--- a/src/matchers/toEqualCaseInsensitive/index.test.js
+++ b/src/matchers/toEqualCaseInsensitive/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toHaveBeenCalledAfter/index.js b/src/matchers/toHaveBeenCalledAfter/index.js
index 675ce978..01737668 100644
--- a/src/matchers/toHaveBeenCalledAfter/index.js
+++ b/src/matchers/toHaveBeenCalledAfter/index.js
@@ -33,23 +33,21 @@ const mockCheckFailMessage = (value, isReceivedValue) => () => {
);
};
-export default {
- toHaveBeenCalledAfter: (firstMock, secondMock) => {
- if (!isJestMockOrSpy(firstMock)) {
- return { pass: false, message: mockCheckFailMessage(firstMock, true) };
- }
-
- if (!isJestMockOrSpy(secondMock)) {
- return { pass: false, message: mockCheckFailMessage(secondMock, false) };
- }
-
- const firstInvocationCallOrder = firstMock.mock.invocationCallOrder;
- const secondInvocationCallOrder = secondMock.mock.invocationCallOrder;
- const pass = predicate(firstInvocationCallOrder, secondInvocationCallOrder);
- if (pass) {
- return { pass: true, message: passMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
- }
-
- return { pass: false, message: failMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
- },
-};
+export function toHaveBeenCalledAfter(firstMock, secondMock) {
+ if (!isJestMockOrSpy(firstMock)) {
+ return { pass: false, message: mockCheckFailMessage(firstMock, true) };
+ }
+
+ if (!isJestMockOrSpy(secondMock)) {
+ return { pass: false, message: mockCheckFailMessage(secondMock, false) };
+ }
+
+ const firstInvocationCallOrder = firstMock.mock.invocationCallOrder;
+ const secondInvocationCallOrder = secondMock.mock.invocationCallOrder;
+ const pass = predicate(firstInvocationCallOrder, secondInvocationCallOrder);
+ if (pass) {
+ return { pass: true, message: passMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
+ }
+
+ return { pass: false, message: failMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
+}
diff --git a/src/matchers/toHaveBeenCalledAfter/index.test.js b/src/matchers/toHaveBeenCalledAfter/index.test.js
index 0320b3d8..750fabe5 100644
--- a/src/matchers/toHaveBeenCalledAfter/index.test.js
+++ b/src/matchers/toHaveBeenCalledAfter/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toHaveBeenCalledBefore/index.js b/src/matchers/toHaveBeenCalledBefore/index.js
index bf30a2a9..d45d487b 100644
--- a/src/matchers/toHaveBeenCalledBefore/index.js
+++ b/src/matchers/toHaveBeenCalledBefore/index.js
@@ -33,23 +33,21 @@ const mockCheckFailMessage = (value, isReceivedValue) => () => {
);
};
-export default {
- toHaveBeenCalledBefore: (firstMock, secondMock) => {
- if (!isJestMockOrSpy(firstMock)) {
- return { pass: false, message: mockCheckFailMessage(firstMock, true) };
- }
-
- if (!isJestMockOrSpy(secondMock)) {
- return { pass: false, message: mockCheckFailMessage(secondMock, false) };
- }
-
- const firstInvocationCallOrder = firstMock.mock.invocationCallOrder;
- const secondInvocationCallOrder = secondMock.mock.invocationCallOrder;
- const pass = predicate(firstInvocationCallOrder, secondInvocationCallOrder);
- if (pass) {
- return { pass: true, message: passMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
- }
-
- return { pass: false, message: failMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
- },
-};
+export function toHaveBeenCalledBefore(firstMock, secondMock) {
+ if (!isJestMockOrSpy(firstMock)) {
+ return { pass: false, message: mockCheckFailMessage(firstMock, true) };
+ }
+
+ if (!isJestMockOrSpy(secondMock)) {
+ return { pass: false, message: mockCheckFailMessage(secondMock, false) };
+ }
+
+ const firstInvocationCallOrder = firstMock.mock.invocationCallOrder;
+ const secondInvocationCallOrder = secondMock.mock.invocationCallOrder;
+ const pass = predicate(firstInvocationCallOrder, secondInvocationCallOrder);
+ if (pass) {
+ return { pass: true, message: passMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
+ }
+
+ return { pass: false, message: failMessage(firstInvocationCallOrder, secondInvocationCallOrder) };
+}
diff --git a/src/matchers/toHaveBeenCalledBefore/index.test.js b/src/matchers/toHaveBeenCalledBefore/index.test.js
index 62abc838..0db113ee 100644
--- a/src/matchers/toHaveBeenCalledBefore/index.test.js
+++ b/src/matchers/toHaveBeenCalledBefore/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toHaveBeenCalledOnce/index.js b/src/matchers/toHaveBeenCalledOnce/index.js
index 1e2f5647..0ed1acc6 100644
--- a/src/matchers/toHaveBeenCalledOnce/index.js
+++ b/src/matchers/toHaveBeenCalledOnce/index.js
@@ -28,18 +28,16 @@ const mockCheckFailMessage = value => () => {
);
};
-export default {
- toHaveBeenCalledOnce: received => {
- if (!isJestMockOrSpy(received)) {
- return { pass: false, message: mockCheckFailMessage(received) };
- }
-
- const pass = predicate(received);
-
- return {
- pass,
- message: pass ? passMessage(received) : failMessage(received),
- actual: received,
- };
- },
-};
+export function toHaveBeenCalledOnce(received) {
+ if (!isJestMockOrSpy(received)) {
+ return { pass: false, message: mockCheckFailMessage(received) };
+ }
+
+ const pass = predicate(received);
+
+ return {
+ pass,
+ message: pass ? passMessage(received) : failMessage(received),
+ actual: received,
+ };
+}
diff --git a/src/matchers/toHaveBeenCalledOnce/index.test.js b/src/matchers/toHaveBeenCalledOnce/index.test.js
index dd2328d8..e9eb1c37 100644
--- a/src/matchers/toHaveBeenCalledOnce/index.test.js
+++ b/src/matchers/toHaveBeenCalledOnce/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toInclude/index.js b/src/matchers/toInclude/index.js
index c9e1f207..9afac421 100644
--- a/src/matchers/toInclude/index.js
+++ b/src/matchers/toInclude/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toInclude: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toInclude(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toInclude/index.test.js b/src/matchers/toInclude/index.test.js
index f0e2220d..2e1ee4b5 100644
--- a/src/matchers/toInclude/index.test.js
+++ b/src/matchers/toInclude/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toIncludeAllMembers/index.js b/src/matchers/toIncludeAllMembers/index.js
index 478c3b3a..da983cbb 100644
--- a/src/matchers/toIncludeAllMembers/index.js
+++ b/src/matchers/toIncludeAllMembers/index.js
@@ -18,12 +18,10 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toIncludeAllMembers: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+export function toIncludeAllMembers(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toIncludeAllMembers/index.test.js b/src/matchers/toIncludeAllMembers/index.test.js
index b303baf7..3862da88 100644
--- a/src/matchers/toIncludeAllMembers/index.test.js
+++ b/src/matchers/toIncludeAllMembers/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toIncludeAllPartialMembers/index.js b/src/matchers/toIncludeAllPartialMembers/index.js
index 52f70379..9fae2570 100644
--- a/src/matchers/toIncludeAllPartialMembers/index.js
+++ b/src/matchers/toIncludeAllPartialMembers/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toIncludeAllPartialMembers: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toIncludeAllPartialMembers(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toIncludeAllPartialMembers/index.test.js b/src/matchers/toIncludeAllPartialMembers/index.test.js
index 6084703c..05d0280d 100644
--- a/src/matchers/toIncludeAllPartialMembers/index.test.js
+++ b/src/matchers/toIncludeAllPartialMembers/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toIncludeAnyMembers/index.js b/src/matchers/toIncludeAnyMembers/index.js
index a6141f81..039a3539 100644
--- a/src/matchers/toIncludeAnyMembers/index.js
+++ b/src/matchers/toIncludeAnyMembers/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toIncludeAnyMembers: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toIncludeAnyMembers(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toIncludeAnyMembers/index.test.js b/src/matchers/toIncludeAnyMembers/index.test.js
index 6653f44f..c1ccd162 100644
--- a/src/matchers/toIncludeAnyMembers/index.test.js
+++ b/src/matchers/toIncludeAnyMembers/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toIncludeMultiple/index.js b/src/matchers/toIncludeMultiple/index.js
index 69ad92ba..ff471602 100644
--- a/src/matchers/toIncludeMultiple/index.js
+++ b/src/matchers/toIncludeMultiple/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toIncludeMultiple: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toIncludeMultiple(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toIncludeMultiple/index.test.js b/src/matchers/toIncludeMultiple/index.test.js
index 11cc013e..aaf39bb6 100644
--- a/src/matchers/toIncludeMultiple/index.test.js
+++ b/src/matchers/toIncludeMultiple/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toIncludeRepeated/index.js b/src/matchers/toIncludeRepeated/index.js
index 963d64d9..ec3482c2 100644
--- a/src/matchers/toIncludeRepeated/index.js
+++ b/src/matchers/toIncludeRepeated/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected, occurrences) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toIncludeRepeated: (actual, expected, occurrences) => {
- const pass = predicate(actual, expected, occurrences);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected, occurrences) };
- }
+export function toIncludeRepeated(actual, expected, occurrences) {
+ const pass = predicate(actual, expected, occurrences);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected, occurrences) };
+ }
- return { pass: false, message: failMessage(actual, expected, occurrences) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected, occurrences) };
+}
diff --git a/src/matchers/toIncludeRepeated/index.test.js b/src/matchers/toIncludeRepeated/index.test.js
index 6ef22956..4d250f59 100644
--- a/src/matchers/toIncludeRepeated/index.test.js
+++ b/src/matchers/toIncludeRepeated/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toIncludeSameMembers/index.js b/src/matchers/toIncludeSameMembers/index.js
index f6dc975d..823559c2 100644
--- a/src/matchers/toIncludeSameMembers/index.js
+++ b/src/matchers/toIncludeSameMembers/index.js
@@ -18,12 +18,10 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toIncludeSameMembers: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+export function toIncludeSameMembers(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toIncludeSameMembers/index.test.js b/src/matchers/toIncludeSameMembers/index.test.js
index 396dfc8a..62001bad 100644
--- a/src/matchers/toIncludeSameMembers/index.test.js
+++ b/src/matchers/toIncludeSameMembers/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toReject/index.js b/src/matchers/toReject/index.js
index dc10eb97..70866c89 100644
--- a/src/matchers/toReject/index.js
+++ b/src/matchers/toReject/index.js
@@ -8,12 +8,10 @@ const passMessage = () =>
const failMessage = () =>
matcherHint('.toReject', 'received', '') + '\n\n' + 'Expected promise to reject, however it resolved.\n';
-export default {
- toReject: async promise => {
- const pass = await predicate(promise);
- if (pass) {
- return { pass: true, message: passMessage };
- }
- return { pass: false, message: failMessage };
- },
-};
+export async function toReject(promise) {
+ const pass = await predicate(promise);
+ if (pass) {
+ return { pass: true, message: passMessage };
+ }
+ return { pass: false, message: failMessage };
+}
diff --git a/src/matchers/toReject/index.test.js b/src/matchers/toReject/index.test.js
index 829bd2ad..d92535e3 100644
--- a/src/matchers/toReject/index.test.js
+++ b/src/matchers/toReject/index.test.js
@@ -1,4 +1,4 @@
-import matcher from '.';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toResolve/index.js b/src/matchers/toResolve/index.js
index a7df0aaf..07203479 100644
--- a/src/matchers/toResolve/index.js
+++ b/src/matchers/toResolve/index.js
@@ -8,12 +8,10 @@ const passMessage = () =>
const failMessage = () =>
matcherHint('.toResolve', 'received', '') + '\n\n' + 'Expected promise to resolve, however it rejected.\n';
-export default {
- toResolve: async promise => {
- const pass = await predicate(promise);
- if (pass) {
- return { pass: true, message: passMessage };
- }
- return { pass: false, message: failMessage };
- },
-};
+export async function toResolve(promise) {
+ const pass = await predicate(promise);
+ if (pass) {
+ return { pass: true, message: passMessage };
+ }
+ return { pass: false, message: failMessage };
+}
diff --git a/src/matchers/toResolve/index.test.js b/src/matchers/toResolve/index.test.js
index c9f618c4..92bcb75e 100644
--- a/src/matchers/toResolve/index.test.js
+++ b/src/matchers/toResolve/index.test.js
@@ -1,4 +1,4 @@
-import matcher from '.';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toSatisfy/index.js b/src/matchers/toSatisfy/index.js
index 1e930762..11128c54 100644
--- a/src/matchers/toSatisfy/index.js
+++ b/src/matchers/toSatisfy/index.js
@@ -16,13 +16,11 @@ const failMessage = (received, expected) => () =>
'Received:\n' +
` ${printReceived(received)}`;
-export default {
- toSatisfy: (actual, predicate) => {
- const pass = predicate(actual);
- if (pass) {
- return { pass: true, message: passMessage(actual, predicate) };
- }
+export function toSatisfy(actual, predicate) {
+ const pass = predicate(actual);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, predicate) };
+ }
- return { pass: false, message: failMessage(actual, predicate) };
- },
-};
+ return { pass: false, message: failMessage(actual, predicate) };
+}
diff --git a/src/matchers/toSatisfy/index.test.js b/src/matchers/toSatisfy/index.test.js
index 1783bc85..0991e2b3 100644
--- a/src/matchers/toSatisfy/index.test.js
+++ b/src/matchers/toSatisfy/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toSatisfyAll/index.js b/src/matchers/toSatisfyAll/index.js
index e2b1c740..3bbe960f 100644
--- a/src/matchers/toSatisfyAll/index.js
+++ b/src/matchers/toSatisfyAll/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toSatisfyAll: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toSatisfyAll(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toSatisfyAll/index.test.js b/src/matchers/toSatisfyAll/index.test.js
index 60e4234d..f6f1f510 100644
--- a/src/matchers/toSatisfyAll/index.test.js
+++ b/src/matchers/toSatisfyAll/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toSatisfyAny/index.js b/src/matchers/toSatisfyAny/index.js
index 9237d1ca..73b417e0 100644
--- a/src/matchers/toSatisfyAny/index.js
+++ b/src/matchers/toSatisfyAny/index.js
@@ -18,13 +18,11 @@ const failMessage = (actual, expected) => () =>
'Received:\n' +
` ${printReceived(actual)}`;
-export default {
- toSatisfyAny: (actual, expected) => {
- const pass = predicate(actual, expected);
- if (pass) {
- return { pass: true, message: passMessage(actual, expected) };
- }
+export function toSatisfyAny(actual, expected) {
+ const pass = predicate(actual, expected);
+ if (pass) {
+ return { pass: true, message: passMessage(actual, expected) };
+ }
- return { pass: false, message: failMessage(actual, expected) };
- },
-};
+ return { pass: false, message: failMessage(actual, expected) };
+}
diff --git a/src/matchers/toSatisfyAny/index.test.js b/src/matchers/toSatisfyAny/index.test.js
index e0fa0fb2..0a7ebba6 100644
--- a/src/matchers/toSatisfyAny/index.test.js
+++ b/src/matchers/toSatisfyAny/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toStartWith/index.js b/src/matchers/toStartWith/index.js
index b6758536..8f96a564 100644
--- a/src/matchers/toStartWith/index.js
+++ b/src/matchers/toStartWith/index.js
@@ -18,13 +18,11 @@ const failMessage = (prefix, string) => () =>
'Received:\n' +
` ${printReceived(string)}`;
-export default {
- toStartWith: (string, prefix) => {
- const pass = predicate(prefix, string);
- if (pass) {
- return { pass: true, message: passMessage(prefix, string) };
- }
+export function toStartWith(string, prefix) {
+ const pass = predicate(prefix, string);
+ if (pass) {
+ return { pass: true, message: passMessage(prefix, string) };
+ }
- return { pass: false, message: failMessage(prefix, string) };
- },
-};
+ return { pass: false, message: failMessage(prefix, string) };
+}
diff --git a/src/matchers/toStartWith/index.test.js b/src/matchers/toStartWith/index.test.js
index 16d140f7..4d99e89e 100644
--- a/src/matchers/toStartWith/index.test.js
+++ b/src/matchers/toStartWith/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
expect.extend(matcher);
diff --git a/src/matchers/toThrowWithMessage/index.js b/src/matchers/toThrowWithMessage/index.js
index e290f34a..6173ccf5 100644
--- a/src/matchers/toThrowWithMessage/index.js
+++ b/src/matchers/toThrowWithMessage/index.js
@@ -21,68 +21,64 @@ const failMessage = (received, expected) => () =>
'Thrown:\n' +
` ${printReceived(received)}\n`;
-export default {
- toThrowWithMessage(callbackOrPromiseReturn, type, message) {
- const isFromReject = this && this.promise === 'rejects'; // See https://github.com/facebook/jest/pull/7621#issue-244312550
- if ((!callbackOrPromiseReturn || typeof callbackOrPromiseReturn !== 'function') && !isFromReject) {
- return {
- pass: false,
- message: () =>
- positiveHint +
- '\n\n' +
- `Received value must be a function but instead "${callbackOrPromiseReturn}" was found`,
- };
- }
+export function toThrowWithMessage(callbackOrPromiseReturn, type, message) {
+ const isFromReject = this && this.promise === 'rejects'; // See https://github.com/facebook/jest/pull/7621#issue-244312550
+ if ((!callbackOrPromiseReturn || typeof callbackOrPromiseReturn !== 'function') && !isFromReject) {
+ return {
+ pass: false,
+ message: () =>
+ positiveHint + '\n\n' + `Received value must be a function but instead "${callbackOrPromiseReturn}" was found`,
+ };
+ }
- if (!type || typeof type !== 'function') {
- return {
- pass: false,
- message: () => positiveHint + '\n\n' + `Expected type to be a function but instead "${type}" was found`,
- };
- }
+ if (!type || typeof type !== 'function') {
+ return {
+ pass: false,
+ message: () => positiveHint + '\n\n' + `Expected type to be a function but instead "${type}" was found`,
+ };
+ }
- if (!message) {
- return {
- pass: false,
- message: () => positiveHint + '\n\n' + ' Message argument is required. ',
- };
- }
+ if (!message) {
+ return {
+ pass: false,
+ message: () => positiveHint + '\n\n' + ' Message argument is required. ',
+ };
+ }
- if (typeof message !== 'string' && !(message instanceof RegExp)) {
- return {
- pass: false,
- message: () =>
- positiveHint +
- '\n\n' +
- 'Unexpected argument for message\n' +
- 'Expected: "string" or "regexp\n' +
- `Got: "${message}"`,
- };
- }
+ if (typeof message !== 'string' && !(message instanceof RegExp)) {
+ return {
+ pass: false,
+ message: () =>
+ positiveHint +
+ '\n\n' +
+ 'Unexpected argument for message\n' +
+ 'Expected: "string" or "regexp\n' +
+ `Got: "${message}"`,
+ };
+ }
- let error;
- if (isFromReject) {
- error = callbackOrPromiseReturn;
- } else {
- try {
- callbackOrPromiseReturn();
- } catch (e) {
- error = e;
- }
+ let error;
+ if (isFromReject) {
+ error = callbackOrPromiseReturn;
+ } else {
+ try {
+ callbackOrPromiseReturn();
+ } catch (e) {
+ error = e;
}
+ }
- if (!error) {
- return {
- pass: false,
- message: () => 'Expected the function to throw an error.\n' + "But it didn't throw anything.",
- };
- }
+ if (!error) {
+ return {
+ pass: false,
+ message: () => 'Expected the function to throw an error.\n' + "But it didn't throw anything.",
+ };
+ }
- const pass = predicate(error, type, message);
- if (pass) {
- return { pass: true, message: passMessage(error, new type(message)) };
- }
+ const pass = predicate(error, type, message);
+ if (pass) {
+ return { pass: true, message: passMessage(error, new type(message)) };
+ }
- return { pass: false, message: failMessage(error, new type(message)) };
- },
-};
+ return { pass: false, message: failMessage(error, new type(message)) };
+}
diff --git a/src/matchers/toThrowWithMessage/index.test.js b/src/matchers/toThrowWithMessage/index.test.js
index f3e829f7..7502ef14 100644
--- a/src/matchers/toThrowWithMessage/index.test.js
+++ b/src/matchers/toThrowWithMessage/index.test.js
@@ -1,4 +1,4 @@
-import matcher from './';
+import * as matcher from './';
const { toThrowWithMessage } = matcher;
expect.extend(matcher);