From ac2e9c836b311b035fead3c8dffaf68c3e340418 Mon Sep 17 00:00:00 2001
From: Ali Waseem <waseema393@gmail.com>
Date: Thu, 5 Feb 2026 15:20:15 -0700
Subject: [PATCH] updated loading on tests

---
 e2e/studio/features/api-access-toggle.spec.ts      | 8 +++++++-
 e2e/studio/features/queue-table-operations.spec.ts | 1 +
 e2e/studio/utils/sql-helpers.ts                    | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/e2e/studio/features/api-access-toggle.spec.ts b/e2e/studio/features/api-access-toggle.spec.ts
index 066d59081e9..a33a141e74e 100644
--- a/e2e/studio/features/api-access-toggle.spec.ts
+++ b/e2e/studio/features/api-access-toggle.spec.ts
@@ -467,6 +467,12 @@ test.describe('API Access Toggle', () => {
   }) => {
     const tableName = `${TABLE_NAME_PREFIX}_preserve_grants`
 
+    await runSQL(page, ref, `DROP TABLE IF EXISTS ${tableName} CASCADE;`)
+
+    let loadPromise = waitForTableToLoad(page, ref)
+    await page.goto(toUrl(`/project/${ref}/editor?schema=public`))
+    await loadPromise
+
     // Step 1: Create a table with partial privileges (only SELECT and INSERT for anon)
     await page.getByRole('button', { name: 'New table', exact: true }).click()
     await expect(page.getByTestId('table-editor-side-panel')).toBeVisible()
@@ -514,7 +520,7 @@ test.describe('API Access Toggle', () => {
     })
 
     // Navigate back to table editor
-    let loadPromise = waitForTableToLoad(page, ref)
+    loadPromise = waitForTableToLoad(page, ref)
     await page.goto(toUrl(`/project/${ref}/editor?schema=public`))
     await loadPromise
 
diff --git a/e2e/studio/features/queue-table-operations.spec.ts b/e2e/studio/features/queue-table-operations.spec.ts
index 3d25d120e69..904aae56021 100644
--- a/e2e/studio/features/queue-table-operations.spec.ts
+++ b/e2e/studio/features/queue-table-operations.spec.ts
@@ -311,6 +311,7 @@ test.describe('Queue Table Operations', () => {
     await expect(page.getByRole('dialog').getByText('Pending changes')).toBeVisible()
 
     await page.keyboard.press('ControlOrMeta+.')
+    await expect(page.getByRole('dialog').getByText('Pending changes')).not.toBeVisible()
     await expect(page.getByRole('button', { name: 'View Details' })).toBeVisible()
 
     await page.keyboard.press('ControlOrMeta+s')
diff --git a/e2e/studio/utils/sql-helpers.ts b/e2e/studio/utils/sql-helpers.ts
index 4860d40a18f..10195c7a2b3 100644
--- a/e2e/studio/utils/sql-helpers.ts
+++ b/e2e/studio/utils/sql-helpers.ts
@@ -13,11 +13,11 @@ export const runSQL = async (page: Page, ref: string, sql: string) => {
   await page.getByTestId('sql-run-button').click()
 
   const confirmButton = page.getByRole('button', { name: 'Run this query' })
-  if (await confirmButton.isVisible({ timeout: 1000 }).catch(() => false)) {
+  if (await confirmButton.isVisible({ timeout: 3000 }).catch(() => false)) {
     await confirmButton.click()
   }
 
   await expect(
     page.getByText('Success. No rows returned').or(page.getByText(/^\d+ rows?$/)).first()
-  ).toBeVisible()
+  ).toBeVisible({ timeout: 30000 })
 }