refactor: prepare tests for migration

Esri · Oct 10, 2024 · cda7494 · cda7494
1 parent d5020f6
commit cda7494
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 14 deletions.
diff --git a/packages/calcite-components/src/components/color-picker/color-picker.e2e.ts b/packages/calcite-components/src/components/color-picker/color-picker.e2e.ts
@@ -912,18 +912,16 @@ describe("calcite-color-picker", () => {
     });
 
     it("value as property", async () => {
-      // initialize page with calcite-color-picker to make it available in the evaluate callback below
       const page = await newE2EPage({
-        html: "<calcite-color-picker></calcite-color-picker>",
+        html: "",
       });
-      await page.setContent("");
 
       await page.evaluate(async (color) => {
         const picker = document.createElement("calcite-color-picker");
         picker.value = color;
         document.body.append(picker);
 
-        await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+        await picker.componentOnReady();
       }, initialColor);
 
       expect(await getInternalColorAsHex(page)).toBe(initialColor);

diff --git a/packages/calcite-components/src/components/loader/loader.tsx b/packages/calcite-components/src/components/loader/loader.tsx
@@ -104,7 +104,6 @@ export class Loader implements LocalizedComponent {
                 [CSS.loaderPart]: true,
                 [CSS.loaderPartId(index)]: true,
               }}
-              key={index}
               style={isDeterminate && index === 3 ? determinateStyle : undefined}
               viewBox={viewbox}
             >

diff --git a/packages/calcite-components/src/components/navigation-user/navigation-user.e2e.ts b/packages/calcite-components/src/components/navigation-user/navigation-user.e2e.ts
@@ -22,7 +22,7 @@ describe("calcite-navigation-user", () => {
       },
       {
         propertyName: "textDisabled",
-        value: "",
+        value: true,
       },
     ]);
   });

diff --git a/packages/calcite-components/src/components/navigation/navigation.e2e.ts b/packages/calcite-components/src/components/navigation/navigation.e2e.ts
@@ -15,7 +15,7 @@ describe("calcite-navigation", () => {
     reflects("calcite-navigation", [
       {
         propertyName: "navigationAction",
-        value: "",
+        value: true,
       },
     ]);
   });

diff --git a/packages/calcite-components/src/components/pick-list-item/pick-list-item.e2e.ts b/packages/calcite-components/src/components/pick-list-item/pick-list-item.e2e.ts
@@ -9,7 +9,7 @@ describe("calcite-pick-list-item", () => {
   });
 
   describe("honors hidden attribute", () => {
-    hidden("calcite-list-item");
+    hidden("calcite-pick-list-item");
   });
 
   // eslint-disable-next-line jest/no-disabled-tests

diff --git a/packages/calcite-components/src/components/rating/rating.e2e.ts b/packages/calcite-components/src/components/rating/rating.e2e.ts
@@ -399,7 +399,7 @@ describe("calcite-rating", () => {
       expect(labels[4]).not.toHaveClass("partial");
     });
 
-    it("should update the ui of the rating when a hover event triggers on a rating label", async () => {
+    it("should update the UI of the rating when a hover event triggers on a rating label", async () => {
       const page = await newE2EPage();
       await page.setContent("<calcite-rating average=3.5></calcite-rating>");
       const element = await page.find("calcite-rating");

diff --git a/packages/calcite-components/src/components/shell-panel/shell-panel.e2e.ts b/packages/calcite-components/src/components/shell-panel/shell-panel.e2e.ts
@@ -118,7 +118,7 @@ describe("calcite-shell-panel", () => {
       "calcite-shell-panel",
       (panel: HTMLCalciteShellPanelElement, containerClass: string, contentClass: string) => {
         const container = panel.shadowRoot.querySelector(containerClass);
-        return container.firstElementChild.className == contentClass;
+        return container.firstElementChild.classList.contains(contentClass);
       },
       `.${CSS.container}`,
       CSS.content,

diff --git a/packages/calcite-components/src/components/time-picker/time-picker.e2e.ts b/packages/calcite-components/src/components/time-picker/time-picker.e2e.ts
@@ -1214,7 +1214,7 @@ describe("calcite-time-picker", () => {
       await page.mouse.click(buttonUpLocationX, buttonUpLocationY);
       await page.waitForChanges();
       const fractionalSecondEl = await page.find(`calcite-time-picker >>> .input.fractionalSecond`);
-      expect(fractionalSecondEl.innerHTML).toEqual("0");
+      expect(fractionalSecondEl.textContent).toEqual("0");
     });
 
     it("upward nudge of empty fractional second sets to 00 for step=0.01", async () => {
@@ -1228,7 +1228,7 @@ describe("calcite-time-picker", () => {
       await page.mouse.click(buttonUpLocationX, buttonUpLocationY);
       await page.waitForChanges();
       const fractionalSecondEl = await page.find(`calcite-time-picker >>> .input.fractionalSecond`);
-      expect(fractionalSecondEl.innerHTML).toEqual("00");
+      expect(fractionalSecondEl.textContent).toEqual("00");
     });
 
     it("upward nudge of empty fractional second sets to 000 for step=0.001", async () => {
@@ -1242,7 +1242,7 @@ describe("calcite-time-picker", () => {
       await page.mouse.click(buttonUpLocationX, buttonUpLocationY);
       await page.waitForChanges();
       const fractionalSecondEl = await page.find(`calcite-time-picker >>> .input.fractionalSecond`);
-      expect(fractionalSecondEl.innerHTML).toEqual("000");
+      expect(fractionalSecondEl.textContent).toEqual("000");
     });
   });
 });
diff --git a/packages/calcite-components/src/utils/form.tsx b/packages/calcite-components/src/utils/form.tsx
@@ -290,7 +290,7 @@ function invalidHandler(event: Event) {
         formComponent.status = "idle";
       }
 
-      if ("validationIcon" in formComponent && !formComponent.validationIcon) {
+      if ("validationIcon" in formComponent) {
         formComponent.validationIcon = false;
       }