Merge branch 'master' into feature/702-build-and-release-ts-vitest

golevelup · Sep 17, 2024 · 7ead77c · 7ead77c
2 parents 5baf85e + e9560d7
commit 7ead77c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/packages/rabbitmq/src/amqp/connection.ts b/packages/rabbitmq/src/amqp/connection.ts
@@ -624,10 +624,10 @@ export class AmqpConnection {
     return consumerTag;
   }
 
-  public publish<T = any>(
+  public publish(
     exchange: string,
     routingKey: string,
-    message: T,
+    message: any,
     options?: Options.Publish
   ): Promise<boolean> {
     let buffer: Buffer;

diff --git a/packages/testing/ts-jest/src/mocks.spec.ts b/packages/testing/ts-jest/src/mocks.spec.ts
@@ -183,6 +183,22 @@ describe('Mocks', () => {
       });
       expect(mock.foo()).toEqual(undefined);
     });
+
+    it('should accept nullable values using mockReturnValueOnce and allow for chaining', async () => {
+      interface Test {
+        foo(): boolean;
+      }
+      const serviceMock = createMock<Test>();
+      jest
+        .spyOn(serviceMock, 'foo')
+        .mockReturnValueOnce(true)
+        .mockReturnValueOnce(false)
+        .mockReturnValueOnce(true);
+
+      expect(serviceMock.foo()).toEqual(true);
+      expect(serviceMock.foo()).toEqual(false);
+      expect(serviceMock.foo()).toEqual(true);
+    });
   });
 
   describe('auto mocked', () => {

diff --git a/packages/testing/ts-jest/src/mocks.ts b/packages/testing/ts-jest/src/mocks.ts
@@ -101,7 +101,7 @@ const createProxy: {
       argsArray
     ) => {
       const result = Reflect.apply(target, thisArg, argsArray);
-      if (target.getMockImplementation() || result) {
+      if (target.getMockImplementation() || result !== undefined) {
         return result;
       } else {
         if (!cache.has('__apply')) {