Skip to content

Commit b8bfdfb

Browse files
benfdkingbenfdking
committed
temp
1 parent 7b0e435 commit b8bfdfb

File tree

11 files changed

+105
-45
lines changed

11 files changed

+105
-45
lines changed

‎vscode/extension/playwright-report/data/d1bd5716a9941b5f96b111fba2ae078910e318b2.webm‎

329 KB
Binary file not shown.

‎vscode/extension/playwright-report/index.html‎

Lines changed: 77 additions & 0 deletions
Large diffs are not rendered by default.

‎vscode/extension/tests/bad_setup.spec.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ test('lineage, no sqlmesh found', async ({ page }) => {
105105

106106
// navigate to code-server instance
107107
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
108-
109-
await page.waitForSelector('text=models')
110-
await page.waitForTimeout(5000)
108+
await page.waitForLoadState('networkidle')
111109

112110
// Open lineage view
113111
await openLineageView(page)
@@ -164,9 +162,7 @@ test('check that the LSP runs correctly by opening lineage when looking at anoth
164162
})
165163
try {
166164
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
167-
168-
await page.waitForSelector('text=models')
169-
await page.waitForTimeout(5_000)
165+
await page.waitForLoadState('networkidle')
170166

171167
// Open the SQL file from the other directory
172168
await openFile(page, sqlFile)

‎vscode/extension/tests/broken_project.spec.ts‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ test('bad project, double model', async ({ page }) => {
4444

4545
await page.waitForSelector('text=Error creating context')
4646

47-
await page.waitForTimeout(1000)
47+
await page.waitForTimeout(500)
4848
} finally {
4949
await stopCodeServer(context)
5050
}
@@ -64,10 +64,7 @@ test('working project, then broken through adding double model, then refixed', a
6464
})
6565
try {
6666
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
67-
68-
// First, verify the project is working correctly
69-
await page.waitForSelector('text=models')
70-
await page.waitForTimeout(5_000)
67+
await page.waitForLoadState('networkidle')
7168

7269
// Open the lineage view to confirm it loads properly
7370
await openLineageView(page)
@@ -194,17 +191,15 @@ test('bad project, double model, check lineage', async ({ page }) => {
194191
})
195192
try {
196193
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
197-
198-
await page.waitForTimeout(5_000)
199-
await page.waitForSelector('text=models')
194+
await page.waitForLoadState('networkidle')
200195

201196
// Open the lineage view
202197
await openLineageView(page)
203198

204199
await page.waitForSelector('text=Error creating context')
205200
await page.waitForSelector('text=Error:')
206201

207-
await page.waitForTimeout(1000)
202+
await page.waitForTimeout(500)
208203
} finally {
209204
await stopCodeServer(context)
210205
}

‎vscode/extension/tests/lineage.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { startCodeServer, stopCodeServer } from './utils_code_server'
1010
* Helper function to launch VS Code and test lineage with given project path config
1111
*/
1212
async function testLineageWithProjectPath(page: Page): Promise<void> {
13-
await page.waitForTimeout(5000)
13+
await page.waitForLoadState('networkidle')
1414
await openLineageView(page)
1515
await page.waitForSelector('text=Loaded SQLMesh context')
1616
}

‎vscode/extension/tests/python_env.spec.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ test.describe('python environment variable injection on sqlmesh_lsp', () => {
6969

7070
try {
7171
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
72-
73-
await page.waitForSelector('text=models')
74-
await page.waitForTimeout(5_000)
72+
await page.waitForLoadState('networkidle')
7573
await openLineageView(page)
7674
await page.waitForSelector('text=Error creating context')
7775
} finally {
@@ -89,8 +87,8 @@ test.describe('python environment variable injection on sqlmesh_lsp', () => {
8987
})
9088
try {
9189
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
92-
await page.waitForSelector('text=models')
93-
await page.waitForTimeout(5_000)
90+
await page.waitForLoadState('networkidle')
91+
9492
await openLineageView(page)
9593
await page.waitForSelector('text=Loaded SQLMesh context')
9694
} finally {
@@ -133,8 +131,7 @@ test.describe('tcloud version', () => {
133131
})
134132
try {
135133
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
136-
await page.waitForSelector('text=models')
137-
await page.waitForTimeout(5_000)
134+
await page.waitForLoadState('networkidle')
138135
await openLineageView(page)
139136
await page.waitForSelector('text=Error creating context')
140137
} finally {
@@ -153,8 +150,7 @@ test.describe('tcloud version', () => {
153150
})
154151
try {
155152
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
156-
await page.waitForSelector('text=models')
157-
await page.waitForTimeout(5_000)
153+
await page.waitForLoadState('networkidle')
158154
await openLineageView(page)
159155
await page.waitForSelector('text=Loaded SQLMesh context')
160156
} finally {

‎vscode/extension/tests/rename_cte.spec.ts‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ test.describe('CTE Rename', () => {
5757
// Type new name and confirm
5858
await page.keyboard.type('new_marketing')
5959
await page.keyboard.press('Enter')
60-
await page.waitForTimeout(1000)
6160

6261
// Verify the rename was applied
63-
await expect(page.locator('text=WITH new_marketing AS')).toBeVisible()
62+
await page.waitForSelector('text=WITH new_marketing AS')
6463
} finally {
6564
await stopCodeServer(context)
6665
}
@@ -88,15 +87,9 @@ test.describe('CTE Rename', () => {
8887

8988
// Confirm rename
9089
await page.keyboard.press('Enter')
91-
await page.waitForTimeout(1000)
9290

93-
// Verify both definition and usage were renamed
94-
await expect(
95-
page.locator('text=WITH updated_marketing_out AS'),
96-
).toBeVisible()
97-
await expect(
98-
page.locator('text=FROM updated_marketing_out'),
99-
).toBeVisible()
91+
await page.waitForSelector('text=WITH updated_marketing_out AS')
92+
await page.waitForSelector('text=FROM updated_marketing_out')
10093
} finally {
10194
await stopCodeServer(context)
10295
}

‎vscode/extension/tests/render.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,7 @@ test('Render shows model picker when no active editor is open', async ({
159159
try {
160160
// Navigate to code-server instance
161161
await page.goto(`http://127.0.0.1:${context.codeServerPort}`)
162-
163-
// Wait for the models folder to be visible
164-
await page.waitForSelector('text=models')
165-
await page.waitForTimeout(5_000)
162+
await page.waitForLoadState('networkidle')
166163

167164
// Load the lineage view to initialize SQLMesh context (like lineage.spec.ts does)
168165
await openLineageView(page)

‎vscode/extension/tests/tcloud.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ test('not signed in, shows sign in window', async ({ page }, testInfo) => {
9696
.click()
9797

9898
// Wait for the file to open
99-
await page.waitForTimeout(2000)
99+
await page.waitForLoadState('networkidle')
100100

101101
await page.waitForSelector(
102102
'text=Please sign in to Tobiko Cloud to use SQLMesh',

‎vscode/extension/tests/utils.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,13 @@ export const pipInstall = async (
8585
/**
8686
* Open the lineage view in the given window.
8787
*/
88-
export const openLineageView = async (window: Page): Promise<void> => {
89-
await window.keyboard.press(
88+
export const openLineageView = async (page: Page): Promise<void> => {
89+
await page.keyboard.press(
9090
process.platform === 'darwin' ? 'Meta+Shift+P' : 'Control+Shift+P',
9191
)
92-
await window.keyboard.type('Lineage: Focus On View')
93-
await window.keyboard.press('Enter')
92+
await page.keyboard.type('Lineage: Focus On View')
93+
await page.locator('a').filter({ hasText: 'Lineage: Focus on View' }).click()
94+
await page.keyboard.press('Enter')
9495
}
9596

9697
/**

0 commit comments

Comments
 (0)