@johanblumenberg/ts-mockito - npm Package Compare versions

Comparing version 1.0.13 to 1.0.14

lib/MethodStubSetter.d.ts

@@ -9,5 +9,5 @@ import { MethodToStub } from "./MethodToStub";
     thenThrow(...rest: Error[]): this;
-    thenCall(func: (...args: any[]) => any): this;
+    thenCall(func: (...args: any[]) => T): this;
     thenResolve(...rest: ResolveType[]): this;
     thenReject(...rest: RejectType[]): this;
 }

lib/MethodStubVerificator.d.ts

@@ -5,2 +5,3 @@ import { MethodToStub } from "./MethodToStub";
     private methodCallToStringConverter;
+    private actualCalls;
     constructor(methodToVerify: MethodToStub);
@@ -7,0 +8,0 @@ called(): void;

lib/MethodStubVerificator.js

@@ -11,2 +11,6 @@ "use strict";
     }
+    MethodStubVerificator.prototype.actualCalls = function () {
+        var calls = this.methodToVerify.mocker.getActionsByName(this.methodToVerify.methodName);
+        return 'Actual calls:\n  ' + this.methodCallToStringConverter.convertActualCalls(calls).join('\n  ');
+    };
     MethodStubVerificator.prototype.called = function () {
@@ -31,3 +35,4 @@ this.atLeast(1);
             var methodToVerifyAsString = this.methodCallToStringConverter.convert(this.methodToVerify);
-            throw new Error("Expected \"" + methodToVerifyAsString + "to be called " + value + " time(s). But has been called " + allMatchingActions.length + " time(s).");
+            var msg = "Expected \"" + methodToVerifyAsString + "to be called " + value + " time(s). But has been called " + allMatchingActions.length + " time(s).";
+            throw new Error(msg + '\n' + this.actualCalls());
         }
@@ -39,3 +44,4 @@ };
             var methodToVerifyAsString = this.methodCallToStringConverter.convert(this.methodToVerify);
-            throw new Error("Expected \"" + methodToVerifyAsString + "to be called at least " + value + " time(s). But has been called " + allMatchingActions.length + " time(s).");
+            var msg = "Expected \"" + methodToVerifyAsString + "to be called at least " + value + " time(s). But has been called " + allMatchingActions.length + " time(s).";
+            throw new Error(msg + '\n' + this.actualCalls());
         }
@@ -47,3 +53,4 @@ };
             var methodToVerifyAsString = this.methodCallToStringConverter.convert(this.methodToVerify);
-            throw new Error("Expected \"" + methodToVerifyAsString + "to be called at least " + value + " time(s). But has been called " + allMatchingActions.length + " time(s).");
+            var msg = "Expected \"" + methodToVerifyAsString + "to be called at most " + value + " time(s). But has been called " + allMatchingActions.length + " time(s).";
+            throw new Error(msg + '\n' + this.actualCalls());
         }
@@ -50,0 +57,0 @@ };

lib/ts-mockito.d.ts

@@ -29,3 +29,3 @@ import { ArgCaptor1, ArgCaptor10, ArgCaptor2, ArgCaptor3, ArgCaptor4, ArgCaptor5, ArgCaptor6, ArgCaptor7, ArgCaptor8, ArgCaptor9 } from "./capture/ArgCaptor";
 export declare function anyOfClass<T>(expectedClass: new (...args: any[]) => T): any;
-export declare function anyFunction(): any;
+export declare function anyFunction<T>(): () => T;
 export declare function anyNumber(): number;
@@ -32,0 +32,0 @@ export declare function anyString(): string;

lib/ts-mockito.js

@@ -163,3 +163,3 @@ "use strict";
 function nextTick() {
-    return new Promise(function (resolve) { return setImmediate(resolve); });
+    return new Promise(function (resolve) { return setTimeout(function () { return setImmediate(resolve); }, 0); });
 }
@@ -166,0 +166,0 @@ exports.nextTick = nextTick;

lib/utils/MethodCallToStringConverter.d.ts

 import { MethodToStub } from "../MethodToStub";
+import { MethodAction } from "../MethodAction";
 export declare class MethodCallToStringConverter {
     convert(method: MethodToStub): string;
+    convertActualCalls(calls: MethodAction[]): string[];
 }

lib/utils/MethodCallToStringConverter.js

@@ -11,2 +11,5 @@ "use strict";
     };
+    MethodCallToStringConverter.prototype.convertActualCalls = function (calls) {
+        return calls.map(function (call) { return call.methodName + '(' + call.args.map(function (arg) { return arg.toString(); }).join(', ') + ')'; });
+    };
     return MethodCallToStringConverter;
@@ -13,0 +16,0 @@ }());

package.json

 {
   "name": "@johanblumenberg/ts-mockito",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Mocking library for TypeScript",
@@ -5,0 +5,0 @@ "main": "lib/ts-mockito.js",

README.md

@@ -11,2 +11,5 @@ # @johanblumenberg/ts-mockito
  - [Support enumerating properties on mocks](https://github.com/johanblumenberg/ts-mockito/commit/67195b7317014b6da27b97869efaeb6305d739da)
+ - [Adding `nextTick()`](https://github.com/johanblumenberg/ts-mockito/pull/2)
+ - [Better types on `anyFunction()` and `thenCall()`](https://github.com/johanblumenberg/ts-mockito/pull/3)
+ - [Better call verification error messages](https://github.com/johanblumenberg/ts-mockito/pull/4)
 
@@ -13,0 +16,0 @@ ## Installation

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Number of lines in readme file

435

increased by0.69%

Worsened metrics

Total package byte prevSize

145991

decreased by-71.9%

Number of package files

115

decreased by-65.57%

Lines of code

2142

decreased by-70.39%

No dependency changes