Compare commits

...

2 Commits

Author SHA1 Message Date
1caa4f0d5f fix tests 2025-04-17 09:24:30 +10:00
fb4ad593b4 fix tests 2025-04-17 09:24:21 +10:00

View File

@ -3069,10 +3069,8 @@ test.describe('manual edits during sketch mode', () => {
sketch002 = startSketchOn(extrude001, face = seg01) sketch002 = startSketchOn(extrude001, face = seg01)
profile002 = startProfileAt([83.39, 329.15], sketch002) profile002 = startProfileAt([83.39, 329.15], sketch002)
|> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001) |> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 156.54, angle = -28) |> angledLine(length = 156.54, angle = -28)
|> angledLine( |> angledLine(
angle = segAng(rectangleSegmentA001),
length = -segLen(rectangleSegmentA001),
angle = -151, angle = -151,
length = 116.27, length = 116.27,
) )
@ -3112,14 +3110,23 @@ test.describe('manual edits during sketch mode', () => {
await test.step('Edit sketch by dragging handle', async () => { await test.step('Edit sketch by dragging handle', async () => {
await page.waitForTimeout(500) await page.waitForTimeout(500)
await expect
.poll(async () => {
await editor.expectEditor.toContain('length = 156.54, angle = -28') await editor.expectEditor.toContain('length = 156.54, angle = -28')
await page.mouse.move(handle1Location.x, handle1Location.y) await page.mouse.move(handle1Location.x, handle1Location.y)
await page.mouse.down() await page.mouse.down()
await page.mouse.move(handle1Location.x + 50, handle1Location.y + 50, { await page.mouse.move(
handle1Location.x + 50,
handle1Location.y + 50,
{
steps: 5, steps: 5,
}) }
)
await page.mouse.up() await page.mouse.up()
await editor.expectEditor.toContain('length = 231.59, angle = -34') await editor.expectEditor.toContain('length = 231.59, angle = -34')
return true
})
.toBeTruthy()
// await page.waitForTimeout(1000) // Wait for update // await page.waitForTimeout(1000) // Wait for update
}) })
@ -3136,6 +3143,8 @@ test.describe('manual edits during sketch mode', () => {
await test.step('Edit sketch again', async () => { await test.step('Edit sketch again', async () => {
await editor.expectEditor.toContain('length = 231.59, angle = -34') await editor.expectEditor.toContain('length = 231.59, angle = -34')
await page.waitForTimeout(500) await page.waitForTimeout(500)
await expect
.poll(async () => {
await page.mouse.move(handle2Location.x, handle2Location.y) await page.mouse.move(handle2Location.x, handle2Location.y)
await page.mouse.down() await page.mouse.down()
await page.mouse.move(handle2Location.x, handle2Location.y - 50, { await page.mouse.move(handle2Location.x, handle2Location.y - 50, {
@ -3143,6 +3152,9 @@ test.describe('manual edits during sketch mode', () => {
}) })
await page.mouse.up() await page.mouse.up()
await editor.expectEditor.toContain('length = 167.36, angle = -14') await editor.expectEditor.toContain('length = 167.36, angle = -14')
return true
})
.toBeTruthy()
}) })
await test.step('add whole other sketch before current sketch', async () => { await test.step('add whole other sketch before current sketch', async () => {
@ -3159,6 +3171,9 @@ test.describe('manual edits during sketch mode', () => {
const handle3Location = { x: 844, y: 212 } const handle3Location = { x: 844, y: 212 }
await test.step('edit sketch again', async () => { await test.step('edit sketch again', async () => {
await page.waitForTimeout(500) // Wait for deferred execution
await expect
.poll(async () => {
await editor.expectEditor.toContain('length = 167.36, angle = -14') await editor.expectEditor.toContain('length = 167.36, angle = -14')
await page.mouse.move(handle3Location.x, handle3Location.y) await page.mouse.move(handle3Location.x, handle3Location.y)
await page.mouse.down() await page.mouse.down()
@ -3167,6 +3182,9 @@ test.describe('manual edits during sketch mode', () => {
}) })
await page.mouse.up() await page.mouse.up()
await editor.expectEditor.toContain('length = 219.2, angle = -56') await editor.expectEditor.toContain('length = 219.2, angle = -56')
return true
})
.toBeTruthy()
}) })
// exit sketch and assert whole code // exit sketch and assert whole code
@ -3174,32 +3192,27 @@ test.describe('manual edits during sketch mode', () => {
await toolbar.exitSketch() await toolbar.exitSketch()
await editor.expectEditor.toContain( await editor.expectEditor.toContain(
`myVar1 = 5 `myVar1 = 5
sketch003 = startSketchOn(XY) sketch003 = startSketchOn(XY)
profile004 = circle(sketch003, center = [143.91, 136.89], radius = 71.63) profile004 = circle(sketch003, center = [143.91, 136.89], radius = 71.63)
sketch001 = startSketchOn(XZ) sketch001 = startSketchOn(XZ)
profile001 = startProfileAt([106.68, 89.77], sketch001) profile001 = startProfileAt([106.68, 89.77], sketch001)
|> line(end = [132.34, 157.8]) |> line(end = [132.34, 157.8])
|> line(end = [67.65, -460.55], tag = $seg01) |> line(end = [67.65, -460.55], tag = $seg01)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close() |> close()
extrude001 = extrude(profile001, length = 500) extrude001 = extrude(profile001, length = 500)
sketch002 = startSketchOn(extrude001, face = seg01) sketch002 = startSketchOn(extrude001, face = seg01)
profile002 = startProfileAt([83.39, 329.15], sketch002) profile002 = startProfileAt([83.39, 329.15], sketch002)
|> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001) |> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 219.2, angle = -56) |> angledLine(length = 219.2, angle = -56)
|> angledLine( |> angledLine(angle = -151, length = 116.27)
angle = segAng(rectangleSegmentA001),
length = -segLen(rectangleSegmentA001),
angle = -151,
length = 116.27,
)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close() |> close()
profile003 = startProfileAt([-201.08, 254.17], sketch002) profile003 = startProfileAt([-201.08, 254.17], sketch002)
|> line(end = [103.55, 33.32]) |> line(end = [103.55, 33.32])
|> line(end = [48.8, -153.54]) |> line(end = [48.8, -153.54])
`, `,
{ shouldNormalise: true } { shouldNormalise: true }
) )
await editor.expectState({ await editor.expectState({
@ -3231,10 +3244,8 @@ test.describe('manual edits during sketch mode', () => {
sketch002 = startSketchOn(extrude001, face = seg01) sketch002 = startSketchOn(extrude001, face = seg01)
profile002 = startProfileAt([83.39, 329.15], sketch002) profile002 = startProfileAt([83.39, 329.15], sketch002)
|> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001) |> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 156.54, angle = -28) |> angledLine(length = 156.54, angle = -28)
|> angledLine( |> angledLine(
angle = segAng(rectangleSegmentA001),
length = -segLen(rectangleSegmentA001),
angle = -151, angle = -151,
length = 116.27, length = 116.27,
) )