Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix toHaveBeenCalledBefore/toHaveBeenCalledAfter type definition #292

Merged
merged 1 commit into from
Jul 19, 2022

Conversation

aheuermann
Copy link
Contributor

@aheuermann aheuermann commented Aug 11, 2020

What

I get a compiler error when passing a jest.MockedFunction type to toHaveBeenCalledAfter()/toHaveBeenCalledBefore().

Why

Code showing the issue.

import { func } from './some-func';
import { SomeClass } from './some-class';

const mockFunc = func as jest.MockedFunction<typeof func>;
const mockClass = SomeClass as jest.MockedClass<typeof SomeClass>;

jest.mock('./some-func');
jest.mock('./some-class');

// all of the following statements generate a compiler error
expect(jest.fn()).toHaveBeenCalledBefore(mockFunc);
expect(jest.fn()).toHaveBeenCalledBefore(mockClass);
expect(jest.fn()).toHaveBeenCalledAfter(mockFunc);
expect(jest.fn()).toHaveBeenCalledAfter(mockClass);

I get this compiler error.

 Argument of type 'MockedFunction<() => void>' is not assignable to parameter of type 'Mock<any, any>'.
  The types returned by 'mockClear().mockClear()' are incompatible between these types.
    Type 'MockedFunction<() => void>' is not assignable to type 'Mock<any, any>'.
      Type 'MockInstance<void, [()?]> & (() => void)' provides no match for the signature 'new (...args: any): any'.

12. expect(jest.fn()).toHaveBeenCalledAfter(mockFunc);

Changing these to jest.MockInstance resolves the issue and should work for all use cases as both jest.MockedFunction and jest.MockedClass extend jest.MockInstance.

Notes

Housekeeping

  • Unit tests
  • Documentation is up to date
  • No additional lint warnings
  • Typescript definitions are added/updated where relevant

jacksteamdev added a commit to jacksteamdev/DefinitelyTyped that referenced this pull request Jan 19, 2021
This change allows `MockedFunction` to be used where `Mock` can be used. I don't think this fundamentally changes `MockedFunction`, just makes it more robust. This would resolve issues where an extended expect method takes a `Mock` type, but the mocking library uses `MockedFunction`.

Related issues:
extend-chrome/jest-chrome#9
jest-community/jest-extended#292
@jacksteamdev
Copy link

Until this gets merged, you can fix this in your own project by adding the following to a declaration file (modules.d.ts or maybe jest-extended.d.ts) to your own project.

/// <reference types="jest" />

declare namespace jest {
  interface Matchers {
    /**
     * Use `.toHaveBeenCalledBefore` when checking if a `MockInstance` was called before another `MockInstance`.
     *
     * Note: Required Jest version >=23
     *
     * @param {MockInstance} mock
     */
    toHaveBeenCalledBefore(mock: jest.MockInstance): R

    /**
     * Use `.toHaveBeenCalledAfter` when checking if a `MockInstance` was called after another `MockInstance`.
     *
     * Note: Required Jest version >=23
     *
     * @param {MockInstance} mock
     */
    toHaveBeenCalledAfter(mock: jest.MockInstance): R
  }

  interface Expect {
    /**
     * Use `.toHaveBeenCalledBefore` when checking if a `MockInstance` was called before another `MockInstance`.
     *
     * Note: Required Jest version >=23
     *
     * @param {MockInstance} mock
     */
    toHaveBeenCalledBefore(mock: jest.MockInstance): R

    /**
     * Use `.toHaveBeenCalledAfter` when checking if a `MockInstance` was called after another `MockInstance`.
     *
     * Note: Required Jest version >=23
     *
     * @param {MockInstance} mock
     */
    toHaveBeenCalledAfter(mock: jest.MockInstance): R
  }
}

types/index.d.ts Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jul 19, 2022

Codecov Report

Merging #292 (be4689c) into main (9d5d236) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##              main      #292   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           71        71           
  Lines          582       582           
  Branches       148       148           
=========================================
  Hits           582       582           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9d5d236...be4689c. Read the comment docs.

@keeganwitt keeganwitt merged commit be7bc8e into jest-community:main Jul 19, 2022
@keeganwitt keeganwitt mentioned this pull request Jul 20, 2022
@SimenB
Copy link
Member

SimenB commented Aug 4, 2022

kodiakhq bot referenced this pull request in X-oss-byte/Nextjs Oct 13, 2023
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [jest-extended](https://togithub.com/jest-community/jest-extended) | [`1.2.1` -> `4.0.2`](https://renovatebot.com/diffs/npm/jest-extended/1.2.1/4.0.2) | [![age](https://developer.mend.io/api/mc/badges/age/npm/jest-extended/4.0.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/jest-extended/4.0.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/jest-extended/1.2.1/4.0.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/jest-extended/1.2.1/4.0.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>jest-community/jest-extended (jest-extended)</summary>

### [`v4.0.2`](https://togithub.com/jest-community/jest-extended/blob/HEAD/CHANGELOG.md#402)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v4.0.1...v4.0.2)

##### Patch Changes

-   [`1f88101`](https://togithub.com/jest-community/jest-extended/commit/1f88101): Mark 2nd param of toHaveBeenCalledBefore and toHaveBeenCalledAfter optional

### [`v4.0.1`](https://togithub.com/jest-community/jest-extended/blob/HEAD/CHANGELOG.md#401)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v4.0.0...v4.0.1)

##### Patch Changes

-   [`bad7056`](https://togithub.com/jest-community/jest-extended/commit/bad7056): Fix `toHaveBeenCalledExactlyOnceWith` typings
-   [`1609897`](https://togithub.com/jest-community/jest-extended/commit/1609897): Remove problematic Vitest types

### [`v4.0.0`](https://togithub.com/jest-community/jest-extended/blob/HEAD/CHANGELOG.md#400)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.2.4...v4.0.0)

##### Major Changes

-   [`ab20845`](https://togithub.com/jest-community/jest-extended/commit/ab20845): Rename toHaveBeenCalledOnceWith to toHaveBeenCalledExactlyOnceWith

##### Minor Changes

-   [`5b80ca8`](https://togithub.com/jest-community/jest-extended/commit/5b80ca8): support vitest 0.31.0

##### Patch Changes

-   [`ab20845`](https://togithub.com/jest-community/jest-extended/commit/ab20845): Make CustomMatchers extend Record to fix a TypeScript error
-   [`ab20845`](https://togithub.com/jest-community/jest-extended/commit/ab20845): Fix toHaveBeenCalledOnceWith messages
-   [`ab20845`](https://togithub.com/jest-community/jest-extended/commit/ab20845): Change unknown to any in toHaveBeenCalledBefore and toHaveBeenCalledAfter

### [`v3.2.4`](https://togithub.com/jest-community/jest-extended/blob/HEAD/CHANGELOG.md#324)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.2.3...v3.2.4)

##### Patch Changes

-   [`0b07513`](https://togithub.com/jest-community/jest-extended/commit/0b07513): Support varargs in toHaveBeenCalledOnceWith ([#&#8203;557](https://togithub.com/jest-community/jest-extended/issues/557))

### [`v3.2.3`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.2.3)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.2.2...v3.2.3)

#### What's Changed

-   fix(types): fix jest AsymmetricMatcher type by [@&#8203;rluvaton](https://togithub.com/rluvaton) in [https://github.com/jest-community/jest-extended/pull/551](https://togithub.com/jest-community/jest-extended/pull/551)

**Full Changelog**: jest-community/jest-extended@v3.2.2...v3.2.3

### [`v3.2.2`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.2.2)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.2.1...v3.2.2)

#### What's Changed

-   fix(types): add vitest support for AsymmetricMatchers by [@&#8203;rluvaton](https://togithub.com/rluvaton) in [https://github.com/jest-community/jest-extended/pull/549](https://togithub.com/jest-community/jest-extended/pull/549)

#### New Contributors

-   [@&#8203;rluvaton](https://togithub.com/rluvaton) made their first contribution in [https://github.com/jest-community/jest-extended/pull/549](https://togithub.com/jest-community/jest-extended/pull/549)

**Full Changelog**: jest-community/jest-extended@v3.2.1...v3.2.2

### [`v3.2.1`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.2.1)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.2.0...v3.2.1)

#### What's Changed

-   Change return type in Expect interface to void by [@&#8203;keeganwitt](https://togithub.com/keeganwitt) in [https://github.com/jest-community/jest-extended/pull/535](https://togithub.com/jest-community/jest-extended/pull/535)
-   Create pass/fail error messages only if required by [@&#8203;overlookmotel](https://togithub.com/overlookmotel) in [https://github.com/jest-community/jest-extended/pull/545](https://togithub.com/jest-community/jest-extended/pull/545)

#### New Contributors

-   [@&#8203;verdecchia](https://togithub.com/verdecchia) made their first contribution in [https://github.com/jest-community/jest-extended/pull/541](https://togithub.com/jest-community/jest-extended/pull/541)
-   [@&#8203;Unclemortuary](https://togithub.com/Unclemortuary) made their first contribution in [https://github.com/jest-community/jest-extended/pull/540](https://togithub.com/jest-community/jest-extended/pull/540)

**Full Changelog**: jest-community/jest-extended@v3.2.0...v3.2.1

### [`v3.2.0`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.2.0)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.1.0...v3.2.0)

#### What's Changed

-   Change return type in Expect interface from `Result` to `any` (closes [#&#8203;484](https://togithub.com/jest-community/jest-extended/issues/484)) by [@&#8203;keeganwitt](https://togithub.com/keeganwitt) in [https://github.com/jest-community/jest-extended/pull/492](https://togithub.com/jest-community/jest-extended/pull/492)
-   Fix `toHaveBeenCalledOnceWith` typing by [@&#8203;akoreh](https://togithub.com/akoreh) in [https://github.com/jest-community/jest-extended/pull/507](https://togithub.com/jest-community/jest-extended/pull/507)
-   Add `vitest` info to docs by [@&#8203;silverwind](https://togithub.com/silverwind) in [https://github.com/jest-community/jest-extended/pull/515](https://togithub.com/jest-community/jest-extended/pull/515)
-   Mark `jest` peerDependency as optional by [@&#8203;silverwind](https://togithub.com/silverwind) in [https://github.com/jest-community/jest-extended/pull/520](https://togithub.com/jest-community/jest-extended/pull/520)
-   `expect`: Add matcher `toBeInRange()` to validate if array elements are within the specified range by [@&#8203;mayankshukla94](https://togithub.com/mayankshukla94) in [https://github.com/jest-community/jest-extended/pull/461](https://togithub.com/jest-community/jest-extended/pull/461)
-   Fix `toHaveBeenCalledOnceWith` type definition (closes [#&#8203;518](https://togithub.com/jest-community/jest-extended/issues/518)) by [@&#8203;keeganwitt](https://togithub.com/keeganwitt) in [https://github.com/jest-community/jest-extended/pull/523](https://togithub.com/jest-community/jest-extended/pull/523)

#### New Contributors

-   [@&#8203;akoreh](https://togithub.com/akoreh) made their first contribution in [https://github.com/jest-community/jest-extended/pull/507](https://togithub.com/jest-community/jest-extended/pull/507)
-   [@&#8203;silverwind](https://togithub.com/silverwind) made their first contribution in [https://github.com/jest-community/jest-extended/pull/515](https://togithub.com/jest-community/jest-extended/pull/515)
-   [@&#8203;mayankshukla94](https://togithub.com/mayankshukla94) made their first contribution in [https://github.com/jest-community/jest-extended/pull/461](https://togithub.com/jest-community/jest-extended/pull/461)

**Full Changelog**: jest-community/jest-extended@v3.1.0...v3.2.0

### [`v3.1.0`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.1.0)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.0.2...v3.1.0)

#### What's Changed

-   Add toHaveBeenCalledOnceWith matcher by [@&#8203;thibautsabot](https://togithub.com/thibautsabot) in [https://github.com/jest-community/jest-extended/pull/430](https://togithub.com/jest-community/jest-extended/pull/430)
-   docs: mention `eslint-plugin-jest-extended` in README by [@&#8203;G-Rath](https://togithub.com/G-Rath) in [https://github.com/jest-community/jest-extended/pull/493](https://togithub.com/jest-community/jest-extended/pull/493)
-   Update jest monorepo to v29 (major) by [@&#8203;renovate](https://togithub.com/renovate) in [https://github.com/jest-community/jest-extended/pull/495](https://togithub.com/jest-community/jest-extended/pull/495)

#### New Contributors

-   [@&#8203;thibautsabot](https://togithub.com/thibautsabot) made their first contribution in [https://github.com/jest-community/jest-extended/pull/430](https://togithub.com/jest-community/jest-extended/pull/430)

**Full Changelog**: jest-community/jest-extended@v3.0.2...v3.1.0

### [`v3.0.2`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.0.2)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.0.1...v3.0.2)

#### What's Changed

-   Fix typings of `toThrowWithMessage`, support unconstructable errors by [@&#8203;GerkinDev](https://togithub.com/GerkinDev) in [https://github.com/jest-community/jest-extended/pull/475](https://togithub.com/jest-community/jest-extended/pull/475)
-   Fix toHaveBeenCalledBefore/toHaveBeenCalledAfter type definition by [@&#8203;aheuermann](https://togithub.com/aheuermann) in [https://github.com/jest-community/jest-extended/pull/292](https://togithub.com/jest-community/jest-extended/pull/292)
-   Declare matchers for use with expect.not.MATCHER ([#&#8203;385](https://togithub.com/jest-community/jest-extended/issues/385)) by [@&#8203;dharkness](https://togithub.com/dharkness) in [https://github.com/jest-community/jest-extended/pull/386](https://togithub.com/jest-community/jest-extended/pull/386)
-   Change any to unknown by [@&#8203;keeganwitt](https://togithub.com/keeganwitt) in [https://github.com/jest-community/jest-extended/pull/477](https://togithub.com/jest-community/jest-extended/pull/477)

#### New Contributors

-   [@&#8203;aheuermann](https://togithub.com/aheuermann) made their first contribution in [https://github.com/jest-community/jest-extended/pull/292](https://togithub.com/jest-community/jest-extended/pull/292)

**Full Changelog**: jest-community/jest-extended@v3.0.1...v3.0.2

### [`v3.0.1`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.0.1)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v3.0.0...v3.0.1)

#### What's Changed

-   fix: use `readonly` array types in matchers by [@&#8203;ilyub](https://togithub.com/ilyub) in [https://github.com/jest-community/jest-extended/pull/465](https://togithub.com/jest-community/jest-extended/pull/465)
-   fix(types): optional `failIfNoSecondInvocation` parameter by [@&#8203;j-waaang](https://togithub.com/j-waaang) in [https://github.com/jest-community/jest-extended/pull/468](https://togithub.com/jest-community/jest-extended/pull/468)

#### New Contributors

-   [@&#8203;ilyub](https://togithub.com/ilyub) made their first contribution in [https://github.com/jest-community/jest-extended/pull/465](https://togithub.com/jest-community/jest-extended/pull/465)
-   [@&#8203;j-waaang](https://togithub.com/j-waaang) made their first contribution in [https://github.com/jest-community/jest-extended/pull/468](https://togithub.com/jest-community/jest-extended/pull/468)

**Full Changelog**: jest-community/jest-extended@v3.0.0...v3.0.1

### [`v3.0.0`](https://togithub.com/jest-community/jest-extended/releases/tag/v3.0.0)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v2.1.0...v3.0.0)

This is the same as https://github.com/jest-community/jest-extended/releases/tag/v2.1.0, but properly released as a major

### [`v2.1.0`](https://togithub.com/jest-community/jest-extended/releases/tag/v2.1.0)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v2.0.0...v2.1.0)

⚠️ This should have been released as a major as it dropped Node 12 and 17 ⚠️

#### What's Changed

-   Restructure project by [@&#8203;mattphillips](https://togithub.com/mattphillips) in [https://github.com/jest-community/jest-extended/pull/410](https://togithub.com/jest-community/jest-extended/pull/410)
-   Fix broken link in example by [@&#8203;mattalexx](https://togithub.com/mattalexx) in [https://github.com/jest-community/jest-extended/pull/422](https://togithub.com/jest-community/jest-extended/pull/422)
-   Update toHaveBeenCalledAfter to fail if second mock is never called by [@&#8203;theryansmee](https://togithub.com/theryansmee) in [https://github.com/jest-community/jest-extended/pull/420](https://togithub.com/jest-community/jest-extended/pull/420)
-   Remove unsupported Node versions by [@&#8203;keeganwitt](https://togithub.com/keeganwitt) in [https://github.com/jest-community/jest-extended/pull/450](https://togithub.com/jest-community/jest-extended/pull/450)
-   chore(deps): lock file maintenance by [@&#8203;renovate](https://togithub.com/renovate) in [https://github.com/jest-community/jest-extended/pull/453](https://togithub.com/jest-community/jest-extended/pull/453)
-   chore(deps): lock file maintenance by [@&#8203;renovate](https://togithub.com/renovate) in [https://github.com/jest-community/jest-extended/pull/454](https://togithub.com/jest-community/jest-extended/pull/454)
-   Fix typos in matcherName in matcherHints by [@&#8203;keeganwitt](https://togithub.com/keeganwitt) in [https://github.com/jest-community/jest-extended/pull/457](https://togithub.com/jest-community/jest-extended/pull/457)
-   feat: upgrade to jest v28 by [@&#8203;G-Rath](https://togithub.com/G-Rath) in [https://github.com/jest-community/jest-extended/pull/463](https://togithub.com/jest-community/jest-extended/pull/463)

#### New Contributors

-   [@&#8203;mattalexx](https://togithub.com/mattalexx) made their first contribution in [https://github.com/jest-community/jest-extended/pull/422](https://togithub.com/jest-community/jest-extended/pull/422)
-   [@&#8203;theryansmee](https://togithub.com/theryansmee) made their first contribution in [https://github.com/jest-community/jest-extended/pull/420](https://togithub.com/jest-community/jest-extended/pull/420)
-   [@&#8203;G-Rath](https://togithub.com/G-Rath) made their first contribution in [https://github.com/jest-community/jest-extended/pull/463](https://togithub.com/jest-community/jest-extended/pull/463)

**Full Changelog**: jest-community/jest-extended@v2.0.0...v2.1.0

### [`v2.0.0`](https://togithub.com/jest-community/jest-extended/releases/tag/v2.0.0)

[Compare Source](https://togithub.com/jest-community/jest-extended/compare/v1.2.1...v2.0.0)

#### What's Changed

-   feat: delete expect and jest-matcher-utils dependencies by [@&#8203;keeganwitt](https://togithub.com/keeganwitt) in [https://github.com/jest-community/jest-extended/pull/405](https://togithub.com/jest-community/jest-extended/pull/405)

#### Breaking changes

-   Only `jest@27.2.5` and newer is supported

**Full Changelog**: jest-community/jest-extended@v1.2.1...v2.0.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/X-oss-byte/Nextjs).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants