Skip to content

Commit c107f7d

Browse files
authored
Merge branch 'main' into AXON-817-fix-performance-measurement-for-experiment-in-jql
2 parents c41f48c + b0aedf5 commit c107f7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1953
-81
lines changed

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44

55
## What's new in 3.8.9
66

7+
### Features
8+
9+
- Added the possibility to remove a reviewer from a PR
10+
711
### Bug Fixes
812

913
- Removed setting options that had no practical or business logic use.
10-
1114
- Fixed a bug where Jira site icon is broken in create Jira issue page
15+
- Fixed a bug with getting the error when deleting multiple instances
16+
- Fixed a bug where we could not assign people to a Jira issue as DC users
1217

1318
## What's new in 3.8.8
1419

@@ -19,7 +24,8 @@
1924
### Bug Fixes
2025

2126
- Fixed a bug where issues would not render due to malformed epic fields (#665)
22-
27+
- Fixed status button in smaller screen size
28+
-
2329
## What's new in 3.8.7
2430

2531
### Features

CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
# review when someone opens a pull request.
88
# AXON TEAM: @bwieger-atlassian-com @sdzh-atlassian @cabella-dot @marcomura
99
# DEV INNER LOOP: @akalia-atlassian @pastelsky
10-
* @bwieger-atlassian-com @sdzh-atlassian @cabella-dot @marcomura @akalia-atlassian @pastelsky
10+
# SOFTSERVE TEAM: @bhorai-atl
11+
12+
* @bwieger-atlassian-com @sdzh-atlassian @cabella-dot @marcomura @akalia-atlassian @pastelsky @bhorai-atl
1113

1214
# Order is important; the last matching pattern takes the most
1315
# precedence. When someone opens a pull request that only

e2e/compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ services:
1616
e2e:
1717
aliases:
1818
- mockedteams.atlassian.net
19+
- jira.mockeddomain.com
1920
expose:
2021
- 443
2122

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { test as base } from '@playwright/test';
2+
3+
export const test = base.extend<{ forEachTest: void }>({
4+
forEachTest: [
5+
async ({ page }, use) => {
6+
await use();
7+
8+
// after test script
9+
await page.getByRole('button', { name: 'Manage' }).click();
10+
await page.waitForTimeout(250);
11+
await page.getByRole('menuitem', { name: 'Command Palette' }).click();
12+
await page.waitForTimeout(500);
13+
await page.keyboard.type('Workspaces: Close Workspace');
14+
await page.waitForTimeout(250);
15+
await page.keyboard.press('Enter');
16+
await page.waitForTimeout(1500);
17+
},
18+
{ auto: true },
19+
],
20+
});

e2e/helpers/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export { updateIssueField } from './update-jira-issue';
22
export { authenticateWithBitbucketDC, authenticateWithBitbucketCloud } from './bitbucket-auth';
33
export { connectRepository } from './bitbucket-connect-repository';
4-
export { authenticateWithJira } from './jira-auth';
4+
export { authenticateWithJira, authenticateWithJiraDC } from './jira-auth';
55
export { getIssueFrame, openAtlassianSettings } from './common';
66
export { cleanupWireMockMapping, setupWireMockMapping, setupSearchMock, setupIssueMock } from './setup-mock';

e2e/helpers/jira-auth.ts

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,47 @@ export const authenticateWithJira = async (
4646
// Wait for authentication to complete and tree items to be visible
4747
await expect(page.getByRole('treeitem', { name: 'BTS-1 - User Interface Bugs' })).toBeVisible();
4848
};
49+
50+
/**
51+
* Helper function to authenticate with Jira DC using the provided credentials
52+
*/
53+
export const authenticateWithJiraDC = async (
54+
page: Page,
55+
baseUrl: string = 'https://jira.mockeddomain.com',
56+
username: string = 'dcUser',
57+
password: string = '12345',
58+
) => {
59+
const settingsFrame = await openAtlassianSettings(page, 'Please login to Jira');
60+
61+
await expect(settingsFrame.getByRole('button', { name: 'Authentication authenticate' })).toBeVisible();
62+
await expect(settingsFrame.getByRole('button', { name: 'Login to Jira' })).toBeVisible();
63+
64+
settingsFrame.getByRole('button', { name: 'Login to Jira' }).click();
65+
await page.waitForTimeout(250);
66+
67+
await settingsFrame.getByRole('textbox', { name: 'Base URL' }).click();
68+
await page.waitForTimeout(250);
69+
70+
await settingsFrame.getByRole('textbox', { name: 'Base URL' }).fill(baseUrl);
71+
await page.waitForTimeout(250);
72+
73+
await settingsFrame.getByRole('textbox', { name: 'Username' }).click();
74+
await page.waitForTimeout(250);
75+
76+
await settingsFrame.getByRole('textbox', { name: 'Username' }).fill(username);
77+
await page.waitForTimeout(250);
78+
79+
await settingsFrame.getByRole('textbox', { name: 'Password' }).click();
80+
await page.waitForTimeout(250);
81+
82+
await settingsFrame.getByRole('textbox', { name: 'Password' }).fill(password);
83+
await page.waitForTimeout(250);
84+
85+
await closeAllNotifications(page);
86+
87+
await settingsFrame.getByRole('button', { name: 'Save Site' }).click();
88+
await page.waitForTimeout(3000);
89+
90+
// Authentication successful - DC auth complete
91+
await expect(page.getByRole('treeitem', { name: 'BTS-1 - User Interface Bugs' })).toBeVisible();
92+
};

e2e/helpers/update-jira-issue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { defaultComment } from '../fixtures/comments';
1+
import { defaultComment } from '../mock-data/comments';
22
import type { FieldUpdater } from './types';
33

44
const updateAttachment: FieldUpdater = (issue, value) => {
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)