From 9e7865da50e2a2f7e6f2321d43cbd3f60f487f45 Mon Sep 17 00:00:00 2001 From: Dan Cormier Date: Wed, 7 Feb 2024 14:58:15 -0500 Subject: [PATCH 1/2] fix(test): ensure `includeNullModifier` value is honored --- lib/test/test-utils.ts | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/test/test-utils.ts b/lib/test/test-utils.ts index b0485b5a79..a6eb6a5388 100644 --- a/lib/test/test-utils.ts +++ b/lib/test/test-utils.ts @@ -215,16 +215,31 @@ const generatePrimitiveVariations = ({ : modifiers.primary : [""]; const secondaryModifiers = modifiers?.secondary - ? ["", ...(<[]>modifiers.secondary)] + ? opts.includeNullModifier + ? ["", ...(<[]>modifiers.secondary)] + : modifiers.secondary : [""]; const globalModifiers = modifiers?.global - ? ["", ...(<[]>modifiers.global)] + ? opts.includeNullModifier + ? ["", ...(<[]>modifiers.global)] + : modifiers.global : [""]; primaryModifiers.forEach((primaryModifier) => { secondaryModifiers.forEach((secondaryModifier) => { globalModifiers.forEach((globalModifier) => { allVariants.forEach((variant) => { + console.log("globalModifier", buildTestid([ + testidBase, + variant, + [ + primaryModifier, + secondaryModifier, + globalModifier, + ] + .filter(Boolean) + .join("-"), + ])); primitiveVariations.push({ classes: buildClasses({ baseClass, From 78517136f47188544dc68e9f6733318edb2797b0 Mon Sep 17 00:00:00 2001 From: Dan Cormier Date: Wed, 7 Feb 2024 15:03:50 -0500 Subject: [PATCH 2/2] Remove console log --- lib/test/test-utils.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/test/test-utils.ts b/lib/test/test-utils.ts index a6eb6a5388..0629edb73a 100644 --- a/lib/test/test-utils.ts +++ b/lib/test/test-utils.ts @@ -229,17 +229,6 @@ const generatePrimitiveVariations = ({ secondaryModifiers.forEach((secondaryModifier) => { globalModifiers.forEach((globalModifier) => { allVariants.forEach((variant) => { - console.log("globalModifier", buildTestid([ - testidBase, - variant, - [ - primaryModifier, - secondaryModifier, - globalModifier, - ] - .filter(Boolean) - .join("-"), - ])); primitiveVariations.push({ classes: buildClasses({ baseClass,