fix: update execute logic for __call

RobinCK · Apr 15, 2019 · f105e52 · f105e52
1 parent 1abcbff
commit f105e52
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/Builder.ts b/src/Builder.ts
@@ -17,7 +17,7 @@ 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;
+        let call: object;
 
         /* istanbul ignore else */
         if (data.__call) {
@@ -29,6 +29,21 @@ export class Builder {
             delete data.__call;
         }
 
+        const callExecutors = () => {
+            /* istanbul ignore else */
+            if (call) {
+                for (const [method, values] of Object.entries(call)) {
+                    /* istanbul ignore else */
+                    if ((entity as any)[method]) {
+                        (entity as any)[method].apply(
+                            entity,
+                            this.parser.parse(values instanceof Array ? values : [values], fixture, this.entities),
+                        );
+                    }
+                }
+            }
+        };
+
         if (fixture.processor) {
             const processorPathWithoutExtension = path.join(
                 path.dirname(fixture.processor),
@@ -52,26 +67,15 @@ export class Builder {
             }
 
             Object.assign(entity, data);
-
-            /* istanbul ignore else */
-            if (call) {
-                for (const [method, values] of Object.entries(call)) {
-                    /* istanbul ignore else */
-                    if ((entity as any)[method]) {
-                        (entity as any)[method].apply(
-                            entity,
-                            this.parser.parse(values instanceof Array ? values : [values], fixture, this.entities),
-                        );
-                    }
-                }
-            }
+            callExecutors();
 
             /* istanbul ignore else */
             if (typeof processorInstance.postProcess === 'function') {
                 await processorInstance.postProcess(fixture.name, entity);
             }
         } else {
             Object.assign(entity, data);
+            callExecutors();
         }
 
         this.entities[fixture.name] = entity;