fix broken tests

Author: dididy

zeppelin-web-angular/e2e/models/workspace-page.util.ts

@@ -25,8 +25,8 @@ export class WorkspaceTestUtil {
 
   async navigateAndWaitForLoad(): Promise<void> {
     await this.workspacePage.navigateToWorkspace();
-    await waitForZeppelinReady(this.page);
     await performLoginIfRequired(this.page);
+    await waitForZeppelinReady(this.page);
   }
 
   async verifyWorkspaceLayout(): Promise<void> {

zeppelin-web-angular/e2e/tests/theme/dark-mode.spec.ts

@@ -50,7 +50,7 @@ test.describe('Dark Mode Theme Switching', () => {
     await test.step('WHEN the user switches to dark mode', async () => {
       await themePage.setThemeInLocalStorage('dark');
       const newPage = await context.newPage();
-      await newPage.goto(currentPage.url());
+      await newPage.goto(currentPage.url(), { waitUntil: 'networkidle' });
       await waitForZeppelinReady(newPage);
 
       // Update themePage to use newPage and verify dark mode

zeppelin-web-angular/e2e/utils.ts

@@ -137,7 +137,8 @@ export function getCoverageTransformPaths(): string[] {
 }
 
 export async function waitForUrlNotContaining(page: Page, fragment: string) {
-  await page.waitForURL(url => !url.toString().includes(fragment));
+  await page.waitForLoadState('domcontentloaded', { timeout: 10000 });
+  await page.waitForURL(url => !url.toString().includes(fragment), { timeout: 15000 });
 }
 
 export function getCurrentPath(page: Page): string {
@@ -183,6 +184,7 @@ export async function performLoginIfRequired(page: Page): Promise<boolean> {
     await loginButton.click();
 
     await page.waitForSelector('text=Welcome to Zeppelin!', { timeout: 5000 });
+    await page.waitForLoadState('networkidle');
     return true;
   }