Revert "Merge pull request #18 from TypeStrong/15-combinelatest-as-fu…

…nction-issue"

This reverts commit 1e2cd43, reversing
changes made to 426058d.

package.json

@@ -24,8 +24,7 @@
   },
   "author": "[email protected]",
   "contributors": [
-    "Andrew Bradley <[email protected]>",
-    "Liron Hazan"
+    "Andrew Bradley <[email protected]>"
   ],
   "license": "MIT",
   "repository": {

src/Mock.ts

@@ -9,6 +9,7 @@ import {strictEqual} from "./ts-mockito";
 import {MockableFunctionsFinder} from "./utils/MockableFunctionsFinder";
 import {ObjectInspector} from "./utils/ObjectInspector";
 import {ObjectPropertyCodeRetriever} from "./utils/ObjectPropertyCodeRetriever";
+import { TODO } from "./utils/types";
 
 export class Mocker {
     public mock: any = {};
@@ -20,15 +21,13 @@ export class Mocker {
     private excludedPropertyNames: string[] = ["hasOwnProperty"];
     private defaultedPropertyNames: string[] = ["Symbol(Symbol.toPrimitive)", "then", "catch"];
 
-    constructor(private clazz: any, public instance: any = {}, isSpy: boolean = false) {
+    constructor(private clazz: any, public instance: any = {}) {
         this.mock.__tsmockitoInstance = this.instance;
         this.mock.__tsmockitoMocker = this;
         if (_.isObject(this.clazz) && _.isObject(this.instance)) {
             this.processProperties((this.clazz as any).prototype);
-            if (!isSpy || typeof Proxy === "undefined") {
-                this.processClassCode(this.clazz);
-                this.processFunctionsCode((this.clazz as any).prototype);
-            }
+            this.processClassCode(this.clazz);
+            this.processFunctionsCode((this.clazz as any).prototype);
         }
         if (typeof Proxy !== "undefined" && this.clazz) {
             this.mock.__tsmockitoInstance = new Proxy(this.instance, this.createCatchAllHandlerForRemainingPropertiesWithoutGetters());

src/Spy.ts

@@ -8,7 +8,7 @@ export class Spy extends Mocker {
     private realMethods: { [key: string]: RealMethod };
 
     constructor(instance: any) {
-        super(instance.constructor, instance, true);
+        super(instance.constructor, instance);
 
         if (_.isObject(instance)) {
             this.processProperties(instance);

test/spy.spec.ts

@@ -2,22 +2,10 @@ import {capture, reset, spy, verify, when} from "../src/ts-mockito";
 
 describe("spying on a real object", () => {
     class Real {
-        public dynamicMethod: Function;
-        public dynamicMethodInFunction: Function;
         public b = 11;
-
-        constructor() {
-            this.dynamicMethod = () => "dynamicMethod";
-        }
-
         get baz() {
             return 3;
         }
-
-        public getBar(): string {
-            this.dynamicMethodInFunction = () => "dynamicMethodInFunction";
-            return "bar";
-        }
         public foo(a: number) {
             return a;
         }
@@ -67,10 +55,6 @@ describe("spying on a real object", () => {
 
             // then
             expect(foo.bar()).toBe(2);
-            expect(foo.getBar()).toBe("bar");
-            expect(foo.dynamicMethod()).toBe("dynamicMethod");
-            expect(foo.dynamicMethodInFunction()).toBe("dynamicMethodInFunction");
-
         });
     });