Fix Global Callbacks being called twice

Batterii · Feb 11, 2021 · cb56873 · cb56873
1 parent 58935db
commit cb56873
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/fixture.ts b/lib/fixture.ts
@@ -117,7 +117,6 @@ export class Fixture<T> extends Definition<T> {
 	getCallbacks(): Callback<T>[] {
 		this.compile();
 
-		const globalCallbacks = this.fixtureRiveter.getCallbacks();
 		const parentCallbacks = this.parentFixture().getCallbacks();
 
 		const definedCallbacks = [
@@ -126,7 +125,7 @@ export class Fixture<T> extends Definition<T> {
 			this.getAdditionalTraits().map((t) => t.getCallbacks()),
 		].flat(2).filter(Boolean);
 
-		return globalCallbacks.concat(parentCallbacks, definedCallbacks);
+		return parentCallbacks.concat(definedCallbacks);
 	}
 
 	traitByName(name: string): Trait<T> {

diff --git a/lib/null-fixture.ts b/lib/null-fixture.ts
@@ -21,7 +21,7 @@ export class NullFixture<T> extends Definition<T> {
 	}
 
 	getCallbacks(): Callback<T>[] {
-		return [];
+		return this.fixtureRiveter.getCallbacks();
 	}
 
 	traitByName(name: string): Trait<T> {

diff --git a/test/acceptance/callbacks.ts b/test/acceptance/callbacks.ts
@@ -175,6 +175,12 @@ describe("global callbacks", function() {
 			f.after("build", (user) => {
 				user.name = user.name.toLowerCase();
 			});
+
+			f.fixture("child user", User, (ff) => {
+				ff.after("build", (user) => {
+					user.name = `childlike: ${user.name}`;
+				});
+			});
 		});
 
 		fr.fixture("company", Company, (f) => {
@@ -193,5 +199,8 @@ describe("global callbacks", function() {
 		expect(user.name).to.equal("A___john doe___!!!Z");
 		const company = await fr.build("company");
 		expect(company.name).to.equal("ACME SUPPLIERS");
+
+		const childUser = await fr.build("child user");
+		expect(childUser.name).to.equal("childlike: john doe");
 	});
 });