fix(builder): call methods

RobinCK · Jan 10, 2019 · ca05906 · ca05906
1 parent f3cdc77
commit ca05906
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/src/Builder.ts b/src/Builder.ts
@@ -16,21 +16,14 @@ export class Builder {
         const repository = this.connection.getRepository(fixture.entity);
         const entity = repository.create();
         let data = this.parser.parse(fixture.data, fixture, this.entities);
+        let call;
 
         if (data.__call) {
-            if (typeof data.__call !== 'object') {
+            if (typeof data.__call !== 'object' || data.__call === null) {
                 throw new Error('invalid "__call" parameter format');
             }
 
-            for (const [method, values] of Object.entries(data.__call)) {
-                if ((entity as any)[method]) {
-                    (entity as any)[method].call(
-                        entity,
-                        this.parser.parse(values instanceof Array ? values : [values], fixture, this.entities),
-                    );
-                }
-            }
-
+            call = data.__call;
             delete data.__call;
         }
 
@@ -58,6 +51,18 @@ export class Builder {
 
             Object.assign(entity, data);
 
+            /* istanbul ignore else */
+            if (call) {
+                for (const [method, values] of Object.entries(call)) {
+                    if ((entity as any)[method]) {
+                        (entity as any)[method].apply(
+                            entity,
+                            this.parser.parse(values instanceof Array ? values : [values], fixture, this.entities),
+                        );
+                    }
+                }
+            }
+
             /* istanbul ignore else */
             if (typeof processorInstance.postProcess === 'function') {
                 processorInstance.postProcess(fixture.name, entity);