Multi-profile sweeps and more robust edit flows in point-and-click

e2e/playwright/command-bar-tests.spec.ts

@@ -10,6 +10,8 @@ test.describe('Command bar tests', () => {
   test('Extrude from command bar selects extrude line after', async ({
     page,
     homePage,
+    toolbar,
+    cmdBar,
   }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -35,20 +37,35 @@ test.describe('Command bar tests', () => {
 
     // Click the line of code for xLine.
     await page.getByText(`close()`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-    await page.waitForTimeout(100)
 
-    await page.getByRole('button', { name: 'Extrude' }).click()
-    await page.waitForTimeout(200)
-    await page.keyboard.press('Enter')
-    await page.waitForTimeout(200)
-    await page.keyboard.press('Enter')
-    await page.waitForTimeout(200)
+    await toolbar.extrudeButton.click()
+    await cmdBar.expectState({
+      stage: 'arguments',
+      commandName: 'Extrude',
+      currentArgKey: 'sketches',
+      currentArgValue: '',
+      headerArguments: {
+        Sketches: '',
+        Length: '',
+      },
+      highlightedHeaderArg: 'sketches',
+    })
+    await cmdBar.progressCmdBar()
+    await cmdBar.progressCmdBar()
+    await cmdBar.expectState({
+      stage: 'review',
+      commandName: 'Extrude',
+      headerArguments: {
+        Sketches: '1 segment',
+        Length: '5',
+      },
+    })
+    await cmdBar.progressCmdBar()
     await expect(page.locator('.cm-activeLine')).toHaveText(
       `extrude001 = extrude(sketch001, length = ${KCL_DEFAULT_LENGTH})`
     )
   })
 
-  // TODO: fix this test after the electron migration
   test('Fillet from command bar', async ({ page, homePage }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
@@ -269,21 +286,22 @@ test.describe('Command bar tests', () => {
     await cmdBar.cmdOptions.getByText('Extrude').click()
 
     // Assert that we're on the selection step
-    await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
+    await expect(page.getByRole('button', { name: 'sketches' })).toBeDisabled()
     // Select a face
     await page.mouse.move(700, 200)
     await page.mouse.click(700, 200)
+    await cmdBar.progressCmdBar()
 
     // Assert that we're on the distance step
     await expect(
-      page.getByRole('button', { name: 'distance', exact: false })
+      page.getByRole('button', { name: 'length', exact: false })
     ).toBeDisabled()
 
     // Assert that the an alternative variable name is chosen,
     // since the default variable name is already in use (distance)
     await page.getByRole('button', { name: 'Create new variable' }).click()
     await expect(page.getByPlaceholder('Variable name')).toHaveValue(
-      'distance001'
+      'length001'
     )
 
     const continueButton = page.getByRole('button', { name: 'Continue' })
@@ -297,7 +315,7 @@ test.describe('Command bar tests', () => {
 
     // Assert we're back on the distance step
     await expect(
-      page.getByRole('button', { name: 'distance', exact: false })
+      page.getByRole('button', { name: 'length', exact: false })
     ).toBeDisabled()
 
     await continueButton.click()
@@ -306,7 +324,7 @@ test.describe('Command bar tests', () => {
     await u.waitForCmdReceive('extrude')
 
     await expect(page.locator('.cm-content')).toContainText(
-      'extrude001 = extrude(sketch001, length = distance001)'
+      'extrude001 = extrude(sketch001, length = length001)'
     )
   })
 

e2e/playwright/editor-tests.spec.ts

@@ -1085,6 +1085,9 @@ sketch001 = startSketchOn(XZ)
     page,
     context,
     homePage,
+    toolbar,
+    cmdBar,
+    scene,
   }) => {
     const u = await getUtils(page)
     await context.addInitScript(async () => {
@@ -1128,17 +1131,30 @@ sketch001 = startSketchOn(XZ)
     await page.waitForTimeout(100)
 
     await page.getByText('startProfile(at = [4.61, -14.01])').click()
-    await expect(page.getByRole('button', { name: 'Extrude' })).toBeVisible()
-    await page.getByRole('button', { name: 'Extrude' }).click()
-
-    await expect(page.getByTestId('command-bar')).toBeVisible()
-    await page.waitForTimeout(100)
-
-    await page.getByRole('button', { name: 'arrow right Continue' }).click()
-    await page.waitForTimeout(100)
-    await expect(page.getByText('Confirm Extrude')).toBeVisible()
-    await page.getByRole('button', { name: 'checkmark Submit command' }).click()
-    await page.waitForTimeout(100)
+    await toolbar.extrudeButton.click()
+    await cmdBar.progressCmdBar()
+    await cmdBar.expectState({
+      stage: 'arguments',
+      currentArgKey: 'length',
+      currentArgValue: '5',
+      headerArguments: {
+        Sketches: '1 face',
+        Length: '',
+      },
+      highlightedHeaderArg: 'length',
+      commandName: 'Extrude',
+    })
+    await cmdBar.progressCmdBar()
+    await cmdBar.expectState({
+      stage: 'review',
+      headerArguments: {
+        Sketches: '1 face',
+        Length: '5',
+      },
+      commandName: 'Extrude',
+    })
+    await cmdBar.progressCmdBar()
+    await scene.settled(cmdBar)
 
     // expect the code to have changed
     await expect(page.locator('.cm-content')).toHaveText(

e2e/playwright/feature-tree-pane.spec.ts

@@ -229,7 +229,7 @@ test.describe('Feature Tree pane', () => {
     const initialCode = `sketch001 = startSketchOn(XZ)
       |> circle(center = [0, 0], radius = 5)
       renamedExtrude = extrude(sketch001, length = ${initialInput})`
-    const newConstantName = 'distance001'
+    const newConstantName = 'length001'
     const expectedCode = `${newConstantName} = 23
     sketch001 = startSketchOn(XZ)
       |> circle(center = [0, 0], radius = 5)
@@ -270,12 +270,12 @@ test.describe('Feature Tree pane', () => {
       await cmdBar.expectState({
         commandName: 'Extrude',
         stage: 'arguments',
-        currentArgKey: 'distance',
+        currentArgKey: 'length',
         currentArgValue: initialInput,
         headerArguments: {
-          Distance: initialInput,
+          Length: initialInput,
         },
-        highlightedHeaderArg: 'distance',
+        highlightedHeaderArg: 'length',
       })
     })
 
@@ -290,7 +290,7 @@ test.describe('Feature Tree pane', () => {
         stage: 'review',
         headerArguments: {
           // The calculated value is shown in the argument summary
-          Distance: initialInput,
+          Length: initialInput,
         },
         commandName: 'Extrude',
       })