refactor: separate dc and cloud e2e jira tests

Author: bhorai-atl

e2e/helpers/jira-auth.ts

@@ -3,14 +3,18 @@ import { expect } from '@playwright/test';
 
 import { closeAllNotifications, openAtlassianSettings } from './common';
 
+const BASE_URL: string = 'https://mockedteams.atlassian.net';
+const USERNAME: string = '[email protected]';
+const PASSWORD: string = '12345';
+
 /**
  * Helper function to authenticate with Jira using the provided credentials
  */
 export const authenticateWithJira = async (
     page: Page,
-    baseUrl: string = 'https://mockedteams.atlassian.net',
-    username: string = '[email protected]',
-    password: string = '12345',
+    baseUrl: string = BASE_URL,
+    username: string = USERNAME,
+    password: string = PASSWORD,
 ) => {
     const settingsFrame = await openAtlassianSettings(page, 'Please login to Jira');
 
@@ -52,9 +56,9 @@ export const authenticateWithJira = async (
  */
 export const authenticateWithJiraDC = async (
     page: Page,
-    baseUrl: string = 'https://jira.mockeddomain.com',
-    username: string = 'dcUser',
-    password: string = '12345',
+    baseUrl: string = BASE_URL,
+    username: string = USERNAME,
+    password: string = PASSWORD,
 ) => {
     const settingsFrame = await openAtlassianSettings(page, 'Please login to Jira');
 

e2e/tests/jira/jiraCloud.spec.ts

@@ -0,0 +1,38 @@
+import { test } from '@playwright/test';
+import { authenticateWithJira } from 'e2e/helpers';
+import {
+    addComment,
+    assigningFlow,
+    attachFile,
+    authFlowJira,
+    checkImageInDescription,
+    createIssue,
+    renameIssue,
+    updateDescription,
+    updateIssueStatus,
+    updateLabelsFlow,
+    viewCommentWithImage,
+} from 'e2e/scenarios/jira';
+
+export const jiraScenarios = [
+    { name: 'Authenticate with Jira', run: authFlowJira },
+    { name: 'Create issue', run: createIssue },
+    { name: 'Rename issue', run: renameIssue },
+    { name: 'Update issue description', run: updateDescription },
+    { name: 'Update issue status', run: updateIssueStatus },
+    { name: 'Add comment to issue', run: addComment },
+    { name: 'View comment with image in issue', run: viewCommentWithImage },
+    { name: 'Attach file to issue', run: attachFile },
+    { name: 'Assigning issue to myself', run: assigningFlow },
+    { name: 'Add and remove existing labels', run: updateLabelsFlow },
+    { name: 'Check image in description', run: checkImageInDescription },
+];
+
+test.describe('Jira Cloud', () => {
+    for (const scenario of jiraScenarios) {
+        test(scenario.name, async ({ page, request }) => {
+            await authenticateWithJira(page);
+            await scenario.run(page, request);
+        });
+    }
+});

e2e/tests/jira/jira.spec.ts renamed to e2e/tests/jira/jiraDC.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@playwright/test';
-import { authenticateWithJira, authenticateWithJiraDC } from 'e2e/helpers';
+import { authenticateWithJiraDC } from 'e2e/helpers';
 import {
     addComment,
     assigningFlow,
@@ -14,11 +14,6 @@ import {
     // checkImageInDescription,
 } from 'e2e/scenarios/jira';
 
-const authTypes = [
-    { name: 'Jira Cloud', authFunc: authenticateWithJira },
-    { name: 'Jira DC', authFunc: authenticateWithJiraDC },
-];
-
 export const jiraScenarios = [
     { name: 'Authenticate with Jira', run: authFlowJira },
     { name: 'Create issue', run: createIssue },
@@ -30,17 +25,15 @@ export const jiraScenarios = [
     { name: 'Attach file to issue', run: attachFile },
     { name: 'Assigning issue to myself', run: assigningFlow },
     { name: 'Add and remove existing labels', run: updateLabelsFlow },
-    // Skipped for now, because it's not working in Jira DC
+    // Skipped for now, because it's not working in Jira DC (separate issue)
     // { name: 'Check image in description', run: checkImageInDescription },
 ];
 
-for (const authType of authTypes) {
-    test.describe(authType.name, () => {
-        for (const scenario of jiraScenarios) {
-            test(scenario.name, async ({ page, request }) => {
-                await authType.authFunc(page);
-                await scenario.run(page, request);
-            });
-        }
-    });
-}
+test.describe('Jira DC', () => {
+    for (const scenario of jiraScenarios) {
+        test(scenario.name, async ({ page, request }) => {
+            await authenticateWithJiraDC(page);
+            await scenario.run(page, request);
+        });
+    }
+});