test: updated startWorkFlow

Author: bhorai-atl

e2e/page-objects/StartWorkPage.ts

@@ -4,13 +4,23 @@ export class StartWorkPage {
     readonly issueFrame: Frame;
 
     readonly startButton: Locator;
+    readonly gitBranchCheckbox: Locator;
 
     constructor(frame: Frame) {
         this.issueFrame = frame;
         this.startButton = this.issueFrame.getByTestId('start-work.start-button');
+        this.gitBranchCheckbox = this.issueFrame.getByTestId('start-work.setup-git-branch-checkbox');
     }
 
     async startWork() {
         await this.startButton.click();
     }
+
+    async setupGitBranch(isEnabled: boolean) {
+        const checkbox = this.gitBranchCheckbox.locator('input[type="checkbox"]');
+        const isChecked = await checkbox.isChecked();
+        if (isChecked !== isEnabled) {
+            await checkbox.click();
+        }
+    }
 }

e2e/tests/jira/startWorkFlow.spec.ts

@@ -1,35 +1,21 @@
-import { test } from '@playwright/test';
-import {
-    authenticateWithBitbucketCloud,
-    authenticateWithJira,
-    connectRepository,
-    getIssueFrame,
-    setupIssueMock,
-    setupSearchMock,
-} from 'e2e/helpers';
+import { expect, test } from '@playwright/test';
+import { authenticateWithJira, getIssueFrame, setupIssueMock, setupSearchMock } from 'e2e/helpers';
 import { AtlascodeDrawer, JiraIssuePage, StartWorkPage } from 'e2e/page-objects';
 
-test.only('I can start work on a Jira', async ({ page, request, context }) => {
-    const issueName = 'BTS-1 - User Interface Bugs';
-    const currentStatus = 'To Do';
-    const nextStatus = 'In Progress';
+const ISSUE_NAME = 'BTS-1 - User Interface Bugs';
+const CURRENT_STATUS = 'To Do';
+const NEXT_STATUS = 'In Progress';
 
+test('I can start work on a Jira', async ({ page, request }) => {
     await authenticateWithJira(page);
     await page.getByRole('tab', { name: 'Atlassian Settings' }).getByLabel(/close/i).click();
 
-    await authenticateWithBitbucketCloud(page, context);
-    await connectRepository(page);
-
     const atlascodeDrawer = new AtlascodeDrawer(page);
-    await atlascodeDrawer.jira.openIssue(issueName);
+    await atlascodeDrawer.jira.openIssue(ISSUE_NAME);
 
     const issueFrame = await getIssueFrame(page);
     const jiraIssuePage = new JiraIssuePage(issueFrame);
-    await jiraIssuePage.status.expectEqual(currentStatus);
-
-    // setup mocks for next status
-    const cleanupIssueMock = await setupIssueMock(request, { status: nextStatus });
-    const cleanupSearchMock = await setupSearchMock(request, nextStatus);
+    await jiraIssuePage.status.expectEqual(CURRENT_STATUS);
 
     await jiraIssuePage.startWork();
 
@@ -38,10 +24,25 @@ test.only('I can start work on a Jira', async ({ page, request, context }) => {
 
     const startWorkFrame = await getIssueFrame(page);
     const startWorkPage = new StartWorkPage(startWorkFrame);
-
+    await startWorkPage.setupGitBranch(false);
     await startWorkPage.startWork();
     await page.waitForTimeout(2_000);
-    await atlascodeDrawer.jira.expectIssueStatus(issueName, nextStatus);
+
+    expect(startWorkFrame.getByText(new RegExp('Assigned the issue to you', 'i'))).toBeVisible();
+    expect(startWorkFrame.getByText(new RegExp(`Transitioned status to ${NEXT_STATUS}`, 'i'))).toBeVisible();
+
+    // setup mocks for next status
+    const cleanupIssueMock = await setupIssueMock(request, { status: NEXT_STATUS });
+    const cleanupSearchMock = await setupSearchMock(request, NEXT_STATUS);
+
+    await page.getByRole('tab', { name: 'Start work on BTS-1', exact: true }).getByLabel(/close/i).click();
+
+    await atlascodeDrawer.jira.openIssue(ISSUE_NAME);
+    const updatedIssueFrame = await getIssueFrame(page);
+    const updatedIssuePage = new JiraIssuePage(updatedIssueFrame);
+
+    await updatedIssuePage.status.expectEqual(NEXT_STATUS);
+    await atlascodeDrawer.jira.openIssue(ISSUE_NAME);
 
     await cleanupIssueMock();
     await cleanupSearchMock();

e2e/wiremock-mappings/mockedteams/assignee.json

@@ -0,0 +1,12 @@
+{
+  "request": {
+    "method": "PUT",
+    "urlPath": "/rest/api/2/issue/BTS-1/assignee"
+  },
+  "response": {
+    "status": 204,
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

src/react/atlascode/startwork/StartWorkPage.tsx

@@ -497,6 +497,7 @@ const StartWorkPage: React.FunctionComponent = () => {
                                             <Grid container spacing={1} direction="row">
                                                 <Grid item>
                                                     <Switch
+                                                        data-testid="start-work.setup-git-branch-checkbox"
                                                         color="primary"
                                                         size="small"
                                                         checked={branchSetupEnabled}

src/webviews/components/issue/view-issue-screen/sidebar/IssueSidebarButtonGroup.tsx

@@ -87,7 +87,7 @@ export const IssueSidebarButtonGroup: React.FC<Props> = ({
                 <Tooltip content="Create a branch and transition this issue">
                     <LoadingButton
                         className="ac-button"
-                        data-testId="issue.start-work-button"
+                        testId="issue.start-work-button"
                         onClick={handleStartWork}
                         iconBefore={<AssetsSchemaIcon label="Start work" />}
                         isLoading={false}