From 82a52e065fe81590b4a39a0c806e16db5ef1e93e Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Tue, 10 May 2022 22:28:48 -0600
Subject: [PATCH] More test fixes

---
 apps/web/playwright/app-store.test.ts | 39 +++++----------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/apps/web/playwright/app-store.test.ts b/apps/web/playwright/app-store.test.ts
index 4a9cecbad5..8419323fac 100644
--- a/apps/web/playwright/app-store.test.ts
+++ b/apps/web/playwright/app-store.test.ts
@@ -1,50 +1,25 @@
+import { expect } from "@playwright/test";
+
 import { test } from "./lib/fixtures";
 
 test.describe("App Store - Authed", () => {
   test.use({ storageState: "playwright/artifacts/proStorageState.json" });
   test("Browse apple-calendar and try to install", async ({ page }) => {
     await page.goto("/apps");
-    page.click('[data-testid="app-store-category-calendar"]');
-    await page.waitForNavigation({
-      url: (url) => {
-        console.log(url, url.pathname);
-        return url.pathname.includes("apps/categories/calendar");
-      },
-    });
-    page.click('[data-testid="app-store-app-card-apple-calendar"]');
-    await page.waitForNavigation({
-      url: (url) => {
-        return url.pathname.includes("apps/apple-calendar");
-      },
-    });
+    await page.click('[data-testid="app-store-category-calendar"]');
+    await page.click('[data-testid="app-store-app-card-apple-calendar"]');
     await page.click('[data-testid="install-app-button"]');
+    await expect(page.locator(`text=Connect to Apple Server`)).toBeVisible();
   });
 });
 
 test.describe("App Store - Unauthed", () => {
   test("Browse apple-calendar and try to install", async ({ page }) => {
     await page.goto("/apps");
-
+    await page.waitForSelector("[data-testid=dashboard-shell]");
     await page.click('[data-testid="app-store-category-calendar"]');
-    if (!page.url().includes("apps/categories/calendar")) {
-      await page.waitForNavigation({
-        url: (url) => {
-          console.log(url, url.pathname);
-          return url.pathname.includes("apps/categories/calendar");
-        },
-      });
-    }
     await page.click('[data-testid="app-store-app-card-apple-calendar"]');
-    await page.waitForNavigation({
-      url: (url) => {
-        return url.pathname.includes("apps/apple-calendar");
-      },
-    });
     await page.click('[data-testid="install-app-button"]');
-    await page.waitForNavigation({
-      url: (url) => {
-        return url.pathname.includes("/auth/login");
-      },
-    });
+    await expect(page.locator(`[data-testid="login-form"]`)).toBeVisible();
   });
 });