Remove Discouraged 'networkidle' Calls (#266)

iTwin · Oct 29, 2024 · 181937a · 181937a
1 parent 56e8cf2
commit 181937a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/change/@itwin-oidc-signin-tool-3c9c072f-ae0a-4ffc-a7fc-06d6c9871fe3.json b/change/@itwin-oidc-signin-tool-3c9c072f-ae0a-4ffc-a7fc-06d6c9871fe3.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Remove discouraged 'networkidle'",
+  "packageName": "@itwin/oidc-signin-tool",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/oidc-signin-tool/src/SignInAutomation.ts b/packages/oidc-signin-tool/src/SignInAutomation.ts
@@ -111,7 +111,6 @@ export async function automatedSignOut<T>(
 }
 
 async function handleErrorPage<T>({ page }: AutomatedContextBase<T>): Promise<void> {
-  await page.waitForLoadState("networkidle");
   const pageTitle = await page.title();
   let errMsgText;
 
@@ -166,7 +165,6 @@ async function handlePingLoginPage<T>(context: AutomatedSignInContext<T>): Promi
   allow = page.locator(testSelectors.pingAllowSubmit);
   await allow.click();
 
-  await page.waitForLoadState("networkidle");
   const error = page.getByText(
     "We didn't recognize the email address or password you entered. Please try again.",
   );
@@ -187,10 +185,14 @@ async function handlePingLoginPage<T>(context: AutomatedSignInContext<T>): Promi
 async function handleFederatedSignin<T>(context: AutomatedSignInContext<T>): Promise<void> {
   const { page } = context;
 
-  await page.waitForLoadState("networkidle");
   if (-1 === page.url().indexOf("microsoftonline"))
     return;
 
+  // Wait for either msUserNameField or fedPassword to be visible
+  const msUserNameFieldPromise = page.waitForSelector(testSelectors.msUserNameField, { state: "visible" });
+  const fedPasswordPromise = page.waitForSelector(testSelectors.fedPassword, { state: "visible" });
+  await Promise.race([msUserNameFieldPromise, fedPasswordPromise]);
+
   if (await checkSelectorExists(page, testSelectors.msUserNameField)) {
     await page.locator(testSelectors.msUserNameField).fill(context.user.email);
     const msSubmit = await page.waitForSelector(testSelectors.msSubmit);
@@ -270,7 +272,6 @@ async function checkSelectorExists(
 }
 
 async function checkErrorOnPage(page: Page, selector: string): Promise<void> {
-  await page.waitForLoadState("networkidle");
   const errMsgElement = await page.$(selector);
   if (errMsgElement) {
     const errMsgText = await errMsgElement.textContent();