Merge pull request #51 from roypeled/fix-broken-class-parser

Fix broken class parser
TypeStrong · Jul 18, 2024 · db1a8a6 · db1a8a6
2 parents 3efba95 + c748a6a
commit db1a8a6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typestrong/ts-mockito",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "description": "Mocking library for TypeScript",
   "main": "lib/ts-mockito.js",
   "typings": "lib/ts-mockito",

diff --git a/src/utils/ObjectPropertyCodeRetriever.ts b/src/utils/ObjectPropertyCodeRetriever.ts
@@ -1,6 +1,7 @@
 
 export class ObjectPropertyCodeRetriever {
     public static getObject(object: any) {
+        if(object.constructor.name === 'Object') return '';
         const props = Object.getOwnPropertyNames(object);
         return `class ${object.constructor.name} {
             ${props.map(prop => {
@@ -17,10 +18,11 @@ export class ObjectPropertyCodeRetriever {
                     `;
             }
             if (!descriptor?.get && !descriptor?.set && typeof object[prop] === 'function') {
-                const propName = prop === 'constructor' ? 'mock_constructor' : '';
+                const propName = prop === 'constructor' ? 'mock_constructor' : prop;
                 const fnStr = String(object[prop]);
+                const addAssignment = prop === 'constructor' || fnStr.startsWith('function ');
                 result += `
-                    ${propName ? `${propName}=` : ''}${fnStr}
+                    ${addAssignment ? `${propName}=` : ''}${fnStr}
                 `;
             }
 

diff --git a/test/mocking.types.spec.ts b/test/mocking.types.spec.ts
@@ -2,6 +2,7 @@ import { MethodToStub } from "../src/MethodToStub";
 import { instance, mock, when } from "../src/ts-mockito";
 import { Bar } from "./utils/Bar";
 import { ThenableClass } from "./utils/Thenable";
+import { EventEmitter } from "events";
 
 describe("mocking", () => {
     describe("mocking abstract class", () => {
@@ -226,6 +227,13 @@ describe("mocking", () => {
 
         });
     });
+
+    describe("mocking native class", () =>{
+        it("should mock", () => {
+            const mocked = mock(TestEmitter);
+            expect(mocked).toBeDefined();
+        });
+    });
 });
 
 abstract class SampleAbstractClass {
@@ -291,3 +299,5 @@ class SampleGeneric<T> {
         return null as unknown as T;
     }
 }
+
+class TestEmitter extends EventEmitter {}