From 9af1b251df57244d61524bf5af757839373249a0 Mon Sep 17 00:00:00 2001
From: m-akinc <7282195+m-akinc@users.noreply.github.com>
Date: Mon, 8 Jan 2024 21:25:57 -0600
Subject: [PATCH] Add additional design token test cases and test fixes (#6883)

---
 ...-27c7d069-c14a-43a7-a6f6-6b060a2fe5d1.json |  7 ++
 .../design-token/fast-design-token.pw.spec.ts | 89 +++++++++++++++++--
 2 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100644 change/@microsoft-fast-foundation-27c7d069-c14a-43a7-a6f6-6b060a2fe5d1.json

diff --git a/change/@microsoft-fast-foundation-27c7d069-c14a-43a7-a6f6-6b060a2fe5d1.json b/change/@microsoft-fast-foundation-27c7d069-c14a-43a7-a6f6-6b060a2fe5d1.json
new file mode 100644
index 00000000000..e17b962dd2b
--- /dev/null
+++ b/change/@microsoft-fast-foundation-27c7d069-c14a-43a7-a6f6-6b060a2fe5d1.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Additional design token test cases",
+  "packageName": "@microsoft/fast-foundation",
+  "email": "7282195+m-akinc@users.noreply.github.com",
+  "dependentChangeType": "none"
+}
diff --git a/packages/web-components/fast-foundation/src/design-token/fast-design-token.pw.spec.ts b/packages/web-components/fast-foundation/src/design-token/fast-design-token.pw.spec.ts
index cf297b31eac..785beb2313a 100644
--- a/packages/web-components/fast-foundation/src/design-token/fast-design-token.pw.spec.ts
+++ b/packages/web-components/fast-foundation/src/design-token/fast-design-token.pw.spec.ts
@@ -126,7 +126,7 @@ test.describe("A DesignToken", () => {
         });
     });
     test.describe("getting and setting a simple value", () => {
-        test("should throw if the token value has never been set on the element or it's any ancestors", async () => {
+        test("should throw if the token value has never been set on the element or its ancestors", async () => {
             const result = await page.evaluate((name: string) => {
                 const target = addElement();
                 const token = DesignToken.create<number>(name);
@@ -202,6 +202,28 @@ test.describe("A DesignToken", () => {
             ).toEqual([12, 14]);
         });
 
+        test("should persist explicitly set value even if it matches the inherited value", async () => {
+            expect(
+                await page.evaluate(async () => {
+                    const results = [];
+                    const ancestor = addElement();
+                    const target = addElement(ancestor);
+                    const token = DesignToken.create<number>(uniqueTokenName());
+                    token.setValueFor(ancestor, 12);
+                    token.setValueFor(target, 12);
+
+                    results.push(token.getValueFor(target));
+
+                    token.setValueFor(ancestor, 14);
+
+                    await Updates.next();
+
+                    results.push(token.getValueFor(target));
+                    return results;
+                })
+            ).toEqual([12, 12]);
+        });
+
         test("should support getting and setting falsey values", async () => {
             expect(
                 await page.evaluate(() => {
@@ -263,6 +285,59 @@ test.describe("A DesignToken", () => {
                     })
                 ).toBe("12");
             });
+
+            test("should inherit CSS custom property from ancestor", async () => {
+                expect(
+                    await page.evaluate(async () => {
+                        const results = [];
+                        const ancestor = addElement();
+                        const target = addElement(ancestor);
+                        const token = DesignToken.create<number>(uniqueTokenName());
+                        token.setValueFor(ancestor, 12);
+                        await Updates.next();
+                        results.push(
+                            window
+                                .getComputedStyle(target)
+                                .getPropertyValue(token.cssCustomProperty)
+                        );
+                        token.setValueFor(ancestor, 14);
+                        await Updates.next();
+                        results.push(
+                            window
+                                .getComputedStyle(target)
+                                .getPropertyValue(token.cssCustomProperty)
+                        );
+                        return results;
+                    })
+                ).toEqual(["12", "14"]);
+            });
+
+            test("should set CSS custom property for element if value stops matching inherited value", async () => {
+                expect(
+                    await page.evaluate(async () => {
+                        const results = [];
+                        const ancestor = addElement();
+                        const target = addElement(ancestor);
+                        const token = DesignToken.create<number>(uniqueTokenName());
+                        token.setValueFor(ancestor, 12);
+                        token.setValueFor(target, 12);
+                        await Updates.next();
+                        results.push(
+                            window
+                                .getComputedStyle(target)
+                                .getPropertyValue(token.cssCustomProperty)
+                        );
+                        token.setValueFor(ancestor, 14);
+                        await Updates.next();
+                        results.push(
+                            window
+                                .getComputedStyle(target)
+                                .getPropertyValue(token.cssCustomProperty)
+                        );
+                        return results;
+                    })
+                ).toEqual(["12", "12"]);
+            });
         });
         test.describe("that is not a CSSDesignToken", () => {
             test("should not set a CSS custom property for the element", async () => {
@@ -963,11 +1038,9 @@ test.describe("A DesignToken", () => {
                     target.$fastController.addStyles(styles);
 
                     await Updates.next();
-                    return window
-                        .getComputedStyle(target)
-                        .getPropertyValue(token.cssCustomProperty);
+                    return window.getComputedStyle(target).getPropertyValue("width");
                 })
-            ).toBe("12");
+            ).toBe("12px");
         });
         test("should set a CSS custom property for the element when the token is set for an ancestor element", async () => {
             expect(
@@ -984,11 +1057,9 @@ test.describe("A DesignToken", () => {
                     target.$fastController.addStyles(styles);
 
                     await Updates.next();
-                    return window
-                        .getComputedStyle(target)
-                        .getPropertyValue(token.cssCustomProperty);
+                    return window.getComputedStyle(target).getPropertyValue("width");
                 })
-            ).toBe("12");
+            ).toBe("12px");
         });
     });