Add missing parameters for function assertions.

thenativeweb · May 5, 2021 · 1f4a7ba · 1f4a7ba
1 parent 465c8fc
commit 1f4a7ba
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/lib/assertions/forFunctions/AssertThatForFunction.ts b/lib/assertions/forFunctions/AssertThatForFunction.ts
@@ -2,9 +2,9 @@ import { CommonAssertions } from '../forAny/CommonAssertions';
 import { FunctionAssertions } from './FunctionAssertions';
 
 /* eslint-disable @typescript-eslint/ban-types */
-type AssertThatForFunction = (actual: Function) => {
- is: CommonAssertions<Function> & FunctionAssertions & {
- not: CommonAssertions<Function> & FunctionAssertions;
+type AssertThatForFunction = <TError extends Error = Error>(actual: Function) => {
+ is: CommonAssertions<Function> & FunctionAssertions<TError> & {
+ not: CommonAssertions<Function> & FunctionAssertions<TError>;
  };
 };
 /* eslint-enable @typescript-eslint/ban-types */

diff --git a/lib/assertions/forFunctions/assertions.ts b/lib/assertions/forFunctions/assertions.ts
@@ -5,26 +5,38 @@ import { assertFunctionIsThrowingAsync } from './assertFunctionIsThrowingAsync';
 import { FunctionAssertions } from './FunctionAssertions';
 import { report } from '../../report';
 
+const getAssertionsForFunction = function (
 // eslint-disable-next-line @typescript-eslint/ban-types
-const getAssertionsForFunction = function (actual: Function): FunctionAssertions {
+ actual: Function
+): FunctionAssertions {
  return {
- throwing (): void {
- report(assertFunctionIsThrowing(actual));
+ throwing <TError extends Error = Error>(
+ expected?: string | RegExp | ((ex: TError) => boolean)
+ ): void {
+ report(assertFunctionIsThrowing(actual, expected));
  },
- async throwingAsync (): Promise<void> {
- report(await assertFunctionIsThrowingAsync(actual));
+ async throwingAsync <TError extends Error = Error>(
+ expected?: string | RegExp | ((ex: TError) => boolean)
+ ): Promise<void> {
+ report(await assertFunctionIsThrowingAsync(actual, expected));
  }
  };
 };
 
+const getNegatedAssertionsForFunction = function (
 // eslint-disable-next-line @typescript-eslint/ban-types
-const getNegatedAssertionsForFunction = function (actual: Function): FunctionAssertions {
+ actual: Function
+): FunctionAssertions {
  return {
- throwing (): void {
- report(assertFunctionIsNotThrowing(actual));
+ throwing <TError extends Error = Error>(
+ expected?: string | RegExp | ((ex: TError) => boolean)
+ ): void {
+ report(assertFunctionIsNotThrowing(actual, expected));
  },
- async throwingAsync (): Promise<void> {
- report(await assertFunctionIsNotThrowingAsync(actual));
+ async throwingAsync <TError extends Error = Error>(
+ expected?: string | RegExp | ((ex: TError) => boolean)
+ ): Promise<void> {
+ report(await assertFunctionIsNotThrowingAsync(actual, expected));
  }
  };
 };

diff --git a/test/unit/randomTests.ts b/test/unit/randomTests.ts