Merge branch 'master' into master

golevelup · Aug 13, 2024 · b804c90 · b804c90
2 parents e478b7f + 20cd8df
commit b804c90
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 5 deletions.
diff --git a/integration/rabbitmq/CHANGELOG.md b/integration/rabbitmq/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.4.0](https://github.com/golevelup/nestjs/compare/rabbitmq-integration@3.3.0...rabbitmq-integration@3.4.0) (2024-08-09)
+
+### Features
+
+- **connection.ts:** adds deserializer options to message handlers (closes [#704](https://github.com/golevelup/nestjs/issues/704)) ([#754](https://github.com/golevelup/nestjs/issues/754)) ([9441bdc](https://github.com/golevelup/nestjs/commit/9441bdc24b6a9935fc4a51612a0d8a04b86e03a1))
+
 # [3.3.0](https://github.com/golevelup/nestjs/compare/rabbitmq-integration@3.2.0...rabbitmq-integration@3.3.0) (2024-04-10)
 
 ### Bug Fixes

diff --git a/integration/rabbitmq/package.json b/integration/rabbitmq/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rabbitmq-integration",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "RabbitMQ integration project",
   "private": true,
   "license": "MIT",

diff --git a/packages/rabbitmq/CHANGELOG.md b/packages/rabbitmq/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.4.0](https://github.com/golevelup/nestjs/compare/@golevelup/nestjs-rabbitmq@5.3.0...@golevelup/nestjs-rabbitmq@5.4.0) (2024-08-09)
+
+### Features
+
+- **connection.ts:** adds deserializer options to message handlers (closes [#704](https://github.com/golevelup/nestjs/issues/704)) ([#754](https://github.com/golevelup/nestjs/issues/754)) ([9441bdc](https://github.com/golevelup/nestjs/commit/9441bdc24b6a9935fc4a51612a0d8a04b86e03a1))
+
 # [5.3.0](https://github.com/golevelup/nestjs/compare/@golevelup/nestjs-rabbitmq@5.2.0...@golevelup/nestjs-rabbitmq@5.3.0) (2024-04-15)
 
 ### Features

diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@golevelup/nestjs-rabbitmq",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "Badass RabbitMQ addons for NestJS",
   "author": "Jesse Carter <jesse.r.carter@gmail.com>",
   "homepage": "https://github.com/golevelup/nestjs/blob/master/packages/rabbitmq/README.md",

diff --git a/packages/stripe/CHANGELOG.md b/packages/stripe/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.8.1](https://github.com/golevelup/nestjs/compare/@golevelup/nestjs-stripe@0.8.0...@golevelup/nestjs-stripe@0.8.1) (2024-08-09)
+
+**Note:** Version bump only for package @golevelup/nestjs-stripe
+
 # [0.8.0](https://github.com/golevelup/nestjs/compare/@golevelup/nestjs-stripe@0.7.0...@golevelup/nestjs-stripe@0.8.0) (2024-05-03)
 
 ### Features

diff --git a/packages/stripe/package.json b/packages/stripe/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@golevelup/nestjs-stripe",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Badass utilities for integrating stripe and NestJS",
   "author": "Jesse Carter <jesse.r.carter@gmail.com>",
   "homepage": "https://github.com/golevelup/nestjs#readme",

diff --git a/packages/testing/ts-jest/CHANGELOG.md b/packages/testing/ts-jest/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.5.2](https://github.com/golevelup/nestjs/compare/@golevelup/ts-jest@0.5.1...@golevelup/ts-jest@0.5.2) (2024-08-12)
+
+### Bug Fixes
+
+- **ts-jest:** fixed nullable mocks issue ([#759](https://github.com/golevelup/nestjs/issues/759)) ([b181b8a](https://github.com/golevelup/nestjs/commit/b181b8aaf3d91302e4fcaaea6f5979499d50ee54)), closes [#757](https://github.com/golevelup/nestjs/issues/757)
+
+## [0.5.1](https://github.com/golevelup/nestjs/compare/@golevelup/ts-jest@0.5.0...@golevelup/ts-jest@0.5.1) (2024-08-09)
+
+### Bug Fixes
+
+- **ts-sinon:** fixed match all issue of jest mocks ([#752](https://github.com/golevelup/nestjs/issues/752)) ([9e8fd47](https://github.com/golevelup/nestjs/commit/9e8fd4745f4be90d86794088f92a75bb3f070665))
+
 # [0.5.0](https://github.com/golevelup/nestjs/compare/@golevelup/ts-jest@0.4.0...@golevelup/ts-jest@0.5.0) (2024-04-10)
 
 ### Features

diff --git a/packages/testing/ts-jest/package.json b/packages/testing/ts-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@golevelup/ts-jest",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Reusable utilities to help level up NestJS Testing",
   "author": "Jesse Carter <jesse.r.carter@gmail.com>",
   "homepage": "https://github.com/golevelup/nestjs#readme",

diff --git a/packages/testing/ts-jest/src/mocks.spec.ts b/packages/testing/ts-jest/src/mocks.spec.ts
@@ -167,6 +167,22 @@ describe('Mocks', () => {
 
       expect(test.base).toEqual(base);
     });
+
+    it('should accept mocks returning nullables', async () => {
+      interface Test {
+        foo(): number | undefined;
+      }
+
+      const mock = createMock<Test>();
+      mock.foo.mockImplementation(() => {
+        return 0;
+      });
+      expect(mock.foo()).toEqual(0);
+      mock.foo.mockImplementation(() => {
+        return undefined;
+      });
+      expect(mock.foo()).toEqual(undefined);
+    });
   });
 
   describe('auto mocked', () => {

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