make findElement public again, fix localStorage access in test

jesseditson · Jun 18, 2024 · dc63891 · dc63891
1 parent c7a9972
commit dc63891
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/src/upd8.ts b/src/upd8.ts
@@ -225,10 +225,7 @@ export class Upd8View<State, Event> {
     };
   }
 
-  private _upd8_findElement(
-    el: string | HTMLElement,
-    selector?: string
-  ): HTMLElement {
+  public findElement(el: string | HTMLElement, selector?: string): HTMLElement {
     let htmlEl;
     const isSel = typeof el === "string";
     if (isSel) {
@@ -281,7 +278,7 @@ export class Upd8View<State, Event> {
         this.setContent(el, value);
       }
     } else {
-      const htmlEl = this._upd8_findElement(el);
+      const htmlEl = this.findElement(el);
       if (Array.isArray(value)) {
         htmlEl?.replaceChildren(...value);
       } else {
@@ -294,7 +291,7 @@ export class Upd8View<State, Event> {
     data: Record<string, string>,
     selector?: string
   ) {
-    const htmlEl = this._upd8_findElement(el, selector);
+    const htmlEl = this.findElement(el, selector);
     Object.entries(data).forEach((d) => {
       const [k, v] = d;
       htmlEl.dataset[k] = v;
@@ -305,7 +302,7 @@ export class Upd8View<State, Event> {
     data: Record<string, string>,
     selector?: string
   ) {
-    const htmlEl = this._upd8_findElement(el, selector);
+    const htmlEl = this.findElement(el, selector);
     Object.entries(data).forEach((d) => {
       const [k, v] = d;
       if (typeof v === "boolean") {

diff --git a/tests/todo-mvc-app.spec.ts b/tests/todo-mvc-app.spec.ts
@@ -441,17 +441,16 @@ async function createDefaultTodos(page: Page) {
   }
 }
 
-const getTODOsFromLocalStorage = () => {
-  try {
-    return JSON.parse(localStorage.getItem("todos-upd8")!);
-  } catch (e) {
-    console.error(`FAILED QUERYING LOCALSTORAGE: ${e}`);
-    return { todos: [] };
-  }
-};
-
 async function checkNumberOfTodosInLocalStorage(page: Page, expected: number) {
   return await page.waitForFunction(async (e) => {
+    const getTODOsFromLocalStorage = () => {
+      try {
+        return JSON.parse(localStorage.getItem("todos-upd8")!);
+      } catch (e) {
+        console.error(`FAILED QUERYING LOCALSTORAGE: ${e}`);
+        return { todos: [] };
+      }
+    };
     return getTODOsFromLocalStorage().length === e;
   }, expected);
 }
@@ -461,6 +460,14 @@ async function checkNumberOfCompletedTodosInLocalStorage(
   expected: number
 ) {
   return await page.waitForFunction(async (e) => {
+    const getTODOsFromLocalStorage = () => {
+      try {
+        return JSON.parse(localStorage.getItem("todos-upd8")!);
+      } catch (e) {
+        console.error(`FAILED QUERYING LOCALSTORAGE: ${e}`);
+        return { todos: [] };
+      }
+    };
     return (
       getTODOsFromLocalStorage().todos.filter((todo: any) => todo.completed)
         .length === e
@@ -470,6 +477,14 @@ async function checkNumberOfCompletedTodosInLocalStorage(
 
 async function checkTodosInLocalStorage(page: Page, title: string) {
   return await page.waitForFunction(async (t) => {
+    const getTODOsFromLocalStorage = () => {
+      try {
+        return JSON.parse(localStorage.getItem("todos-upd8")!);
+      } catch (e) {
+        console.error(`FAILED QUERYING LOCALSTORAGE: ${e}`);
+        return { todos: [] };
+      }
+    };
     return getTODOsFromLocalStorage()
       .todos.map((todo: any) => todo.title)
       .includes(t);