Fix waitForSelector calls in create-daml-app-tests (digital-asset#6253)

`waitForSelector` returns immediately if the selector is already present (which is documented). This means that the waitForSelector after the second follow isn’t doing anything since we already waited for after the first follow. `waitForFunction` seemed like the simplest solution and doesn’t require patching the HTML which is a bit finnicky in the compat tests. changelog_begin changelog_end
kgeonw · Jun 8, 2020 · 5feab1b · 5feab1b
1 parent fd52fb2
commit 5feab1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/compatibility/bazel_tools/create-daml-app/index.test.ts b/compatibility/bazel_tools/create-daml-app/index.test.ts
@@ -307,7 +307,9 @@ test("log in as three different users and start following each other", async ()
 
   // Add Party 3 as well and check both are in the list.
   await follow(page1, party3);
-  await page1.waitForSelector(".test-select-following");
+  await page1.waitForFunction(
+    () => document.querySelectorAll(".test-select-following").length == 2
+  );
   const followingList11 = await page1.$$eval(
     ".test-select-following",
     (following) => following.map((e) => e.innerHTML)
@@ -344,7 +346,9 @@ test("log in as three different users and start following each other", async ()
   await follow(page2, party3);
 
   // Check the following list is updated correctly.
-  await page2.waitForSelector(".test-select-following");
+  await page2.waitForFunction(
+    () => document.querySelectorAll(".test-select-following").length == 2
+  );
   const followingList2 = await page2.$$eval(
     ".test-select-following",
     (following) => following.map((e) => e.innerHTML)

diff --git a/templates/create-daml-app-test-resources/index.test.ts b/templates/create-daml-app-test-resources/index.test.ts
@@ -234,7 +234,9 @@ test('log in as three different users and start following each other', async ()
 
    // Add Party 3 as well and check both are in the list.
    await follow(page1, party3);
-   await page1.waitForSelector('.test-select-following');
+   await page1.waitForFunction(
+    () => document.querySelectorAll(".test-select-following").length == 2
+   );
    const followingList11 = await page1.$$eval('.test-select-following', following => following.map(e => e.innerHTML));
    expect(followingList11).toHaveLength(2);
    expect(followingList11).toContain(party2);
@@ -266,7 +268,9 @@ test('log in as three different users and start following each other', async ()
   await follow(page2, party3);
 
   // Check the following list is updated correctly.
-  await page2.waitForSelector('.test-select-following');
+  await page2.waitForFunction(
+    () => document.querySelectorAll(".test-select-following").length == 2
+  );
   const followingList2 = await page2.$$eval('.test-select-following', following => following.map(e => e.innerHTML));
   expect(followingList2).toHaveLength(2);
   expect(followingList2).toContain(party1);