From f322a652f1c82ae96a60da76b3c78c3d555f4713 Mon Sep 17 00:00:00 2001 From: P Christopher Bowers <41601975+pcbowers@users.noreply.github.com> Date: Tue, 30 Apr 2024 03:07:46 -0400 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=8F=B7=EF=B8=8F=20Use=20generi?= =?UTF-8?q?c=20return=20type=20for=20all=20jest=20matchers=20(#655)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This better aligns with jest documentation: https://archive.jestjs.io/docs/en/23.x/expect#expectextendmatchers and ensures that types can work properly with other jest extension libraries like jest-chain. --- .../spectator/jest/src/lib/matchers-types.ts | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/projects/spectator/jest/src/lib/matchers-types.ts b/projects/spectator/jest/src/lib/matchers-types.ts index 6daa9c55..7afa788f 100644 --- a/projects/spectator/jest/src/lib/matchers-types.ts +++ b/projects/spectator/jest/src/lib/matchers-types.ts @@ -1,59 +1,59 @@ declare namespace jest { interface Matchers { - toExist(): boolean; + toExist(): R; - toHaveLength(expected: number): boolean; + toHaveLength(expected: number): R; - toHaveId(id: string | number): boolean; + toHaveId(id: string | number): R; - toHaveClass(className: string | string[], options?: { strict: boolean }): boolean; + toHaveClass(className: string | string[], options?: { strict: boolean }): R; - toHaveAttribute(attr: string | object, val?: string): boolean; + toHaveAttribute(attr: string | object, val?: string): R; - toHaveProperty(prop: string | object, val?: string | boolean): boolean; + toHaveProperty(prop: string | object, val?: string | boolean): R; - toContainProperty(prop: string | object, val?: string): boolean; + toContainProperty(prop: string | object, val?: string): R; - toHaveText(text: string | string[] | ((text: string) => boolean), exact?: boolean): boolean; + toHaveText(text: string | string[] | ((text: string) => boolean), exact?: boolean): R; - toContainText(text: string | string[] | ((text: string) => boolean), exact?: boolean): boolean; + toContainText(text: string | string[] | ((text: string) => boolean), exact?: boolean): R; - toHaveExactText(text: string | string[] | ((text: string) => boolean), options?: { trim: boolean }): boolean; + toHaveExactText(text: string | string[] | ((text: string) => boolean), options?: { trim: boolean }): R; - toHaveExactTrimmedText(text: string | string[] | ((text: string) => boolean)): boolean; + toHaveExactTrimmedText(text: string | string[] | ((text: string) => boolean)): R; - toHaveValue(value: string | string[]): boolean; + toHaveValue(value: string | string[]): R; - toContainValue(value: string | string[]): boolean; + toContainValue(value: string | string[]): R; - toHaveStyle(style: { [styleKey: string]: any }): boolean; + toHaveStyle(style: { [styleKey: string]: any }): R; - toHaveData({ data, val }: { data: string; val: string }): boolean; + toHaveData({ data, val }: { data: string; val: string }): R; - toBeChecked(): boolean; + toBeChecked(): R; - toBeIndeterminate(): boolean; + toBeIndeterminate(): R; - toBeDisabled(): boolean; + toBeDisabled(): R; - toBeEmpty(): boolean; + toBeEmpty(): R; - toBePartial(partial: object): boolean; + toBePartial(partial: object): R; - toBeHidden(): boolean; + toBeHidden(): R; - toBeSelected(): boolean; + toBeSelected(): R; - toBeVisible(): boolean; + toBeVisible(): R; - toBeFocused(): boolean; + toBeFocused(): R; - toBeMatchedBy(selector: string | Element): boolean; + toBeMatchedBy(selector: string | Element): R; - toHaveDescendant(selector: string | Element): boolean; + toHaveDescendant(selector: string | Element): R; - toHaveDescendantWithText({ selector, text }: { selector: string; text: string }): boolean; + toHaveDescendantWithText({ selector, text }: { selector: string; text: string }): R; - toHaveSelectedOptions(expected: string | string[] | HTMLOptionElement | HTMLOptionElement[]): boolean; + toHaveSelectedOptions(expected: string | string[] | HTMLOptionElement | HTMLOptionElement[]): R; } } From 30b96b8bb1019097ad847d2face5b748b44715a0 Mon Sep 17 00:00:00 2001 From: Netanel Basal Date: Tue, 30 Apr 2024 19:37:37 +0300 Subject: [PATCH 2/2] chore(release): 18.0.2 --- CHANGELOG.md | 7 +++++++ projects/spectator/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c269acbd..35fbc031 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [18.0.2](https://github.com/ngneat/spectator/compare/v18.0.1...v18.0.2) (2024-04-30) + + +### Bug Fixes + +* 🏷️ Use generic return type for all jest matchers ([#655](https://github.com/ngneat/spectator/issues/655)) ([f322a65](https://github.com/ngneat/spectator/commit/f322a652f1c82ae96a60da76b3c78c3d555f4713)) + ### [18.0.1](https://github.com/ngneat/spectator/compare/v18.0.0...v18.0.1) (2024-03-21) diff --git a/projects/spectator/package.json b/projects/spectator/package.json index 08a94632..cd511d8c 100644 --- a/projects/spectator/package.json +++ b/projects/spectator/package.json @@ -2,7 +2,7 @@ "name": "@ngneat/spectator", "description": "A powerful tool to simplify your Angular tests", "author": "Netanel Basal ", - "version": "18.0.1", + "version": "18.0.2", "license": "MIT", "repository": { "type": "git",