Merge branch 'master' into maintenance/reimplement-karma

* master: Version bumped to 2.2.4 Typo fix ObjectPropertyCodeRetriever toString issue fix Version bumped to 2.2.3 Fix ProxyHandler ES5 type issue
NagRock · Oct 14, 2017 · fb3de09 · fb3de09
2 parents 039b17a + ed25073
commit fb3de09
Show file tree

Hide file tree

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

diff --git a/src/Mock.ts b/src/Mock.ts
@@ -36,7 +36,7 @@ export class Mocker {
         return new Proxy(this.mock, this.createCatchAllHandlerForRemainingPropertiesWithoutGetters());
     }
 
-    public createCatchAllHandlerForRemainingPropertiesWithoutGetters(): ProxyHandler<any> {
+    public createCatchAllHandlerForRemainingPropertiesWithoutGetters(): any {
         return {
             get: (target: any, name: PropertyKey) => {
                 const hasMethodStub = name in target;

diff --git a/src/utils/ObjectPropertyCodeRetriever.ts b/src/utils/ObjectPropertyCodeRetriever.ts
@@ -12,6 +12,6 @@ export class ObjectPropertyCodeRetriever {
         if (descriptor.set) {
             accessorsCodes.push(descriptor.set.toString());
         }
-        return accessorsCodes.join(" ") || object[propertyName].toString();
+        return accessorsCodes.join(" ") || String(object[propertyName]);
     }
 }
diff --git a/test/utils/ObjectPropertyCodeRetriever.spec.ts b/test/utils/ObjectPropertyCodeRetriever.spec.ts
@@ -7,6 +7,9 @@ describe("ObjectPropertyCodeRetriever", () => {
 
         beforeEach(() => {
             object = {
+                undefinedProperty: undefined,
+                nullProperty: null,
+                nanProperty: NaN,
                 stringProperty: "stringProperty",
                 booleanProperty: true,
                 testMethod: () => true,
@@ -20,9 +23,12 @@ describe("ObjectPropertyCodeRetriever", () => {
         });
 
         it("Provides code of given existing property", () => {
+            expect(objectPropertyCodeRetriever.get(object, "undefinedProperty")).toBe("undefined");
+            expect(objectPropertyCodeRetriever.get(object, "nullProperty")).toBe("null");
+            expect(objectPropertyCodeRetriever.get(object, "nanProperty")).toBe("NaN");
             expect(objectPropertyCodeRetriever.get(object, "stringProperty")).toBe("stringProperty");
             expect(objectPropertyCodeRetriever.get(object, "booleanProperty")).toBe("true");
-            expect(objectPropertyCodeRetriever.get(object, "testMethod")).toBe("function () {return true;}");
+            expect(objectPropertyCodeRetriever.get(object, "testMethod")).toMatch(/function \(\)/);
         });
 
         it("Provides code of given existing property accessors", () => {