Skip to content

The Unified and Autonomous Development Platform

refactor: Update issue type terminology in E2E tests and related components

Robin Shen5081cf2cfaa4
diff --git a/e2e-test/tests/api.js b/e2e-test/tests/api.js
index 355280c3d8..14ccd39559 100644
--- a/e2e-test/tests/api.js
+++ b/e2e-test/tests/api.js
@@ -58,7 +58,7 @@ export class FixturesApi {
const id = await this.json('post', '~api/issues', {
// Built-in required fields have no defaults on a fresh server.
data: { projectId: project.id, title, description, confidential,
- fields: { Type: 'New Feature', Priority: 'Normal', ...fields } },
+ fields: { Type: 'Enhancement', Priority: 'Normal', ...fields } },
...(creator ? { headers: credentials(creator) } : {}),
});
const issue = await this.json('get', `~api/issues/${id}`);
diff --git a/e2e-test/tests/edit-issue-field-from-list.spec.js b/e2e-test/tests/edit-issue-field-from-list.spec.js
index cbc18a7cc7..5e1f83343f 100644
--- a/e2e-test/tests/edit-issue-field-from-list.spec.js
+++ b/e2e-test/tests/edit-issue-field-from-list.spec.js
@@ -23,9 +23,9 @@ test('admin can edit an issue field from the issue list', async ({ page, api })
await expect(editor).toBeVisible();
await expect(editor.locator('.select2-selection__rendered')).toHaveText('Bug');
await editor.locator('.select2-selection').click();
- await page.getByRole('option', { name: 'New Feature', exact: true }).click();
+ await page.getByRole('option', { name: 'Enhancement', exact: true }).click();
await expect(editor).toBeHidden();
- await expect(field).toHaveText('New Feature');
+ await expect(field).toHaveText('Enhancement');
await page.reload();
- await expect(field).toHaveText('New Feature');
+ await expect(field).toHaveText('Enhancement');
});
diff --git a/e2e-test/tests/jev-issue-suggestions.spec.js b/e2e-test/tests/jev-issue-suggestions.spec.js
index 6f8858cfe1..afd1cb7cb4 100644
--- a/e2e-test/tests/jev-issue-suggestions.spec.js
+++ b/e2e-test/tests/jev-issue-suggestions.spec.js
@@ -43,13 +43,13 @@ test('uncertain and unknown suggestions leave fields empty and manual choices st
await expect(field(page, 'Type').locator('select')).toHaveValue('');
await expect(field(page, 'Priority').locator('select')).toHaveValue('');
await field(page, 'Type').locator('.select2-selection').click();
- await page.getByRole('option', { name: 'Improvement', exact: true }).click();
+ await page.getByRole('option', { name: 'Enhancement', exact: true }).click();
const request = await jev.nextRequest(1);
expect(Object.keys(request.body.questions)).toHaveLength(1);
expect(Object.values(request.body.questions)[0].instructions).toContain("'Priority'");
jev.reply(request);
await expect(field(page, 'Priority').locator('select')).toHaveValue('Major');
- await expect(field(page, 'Type').locator('select')).toHaveValue('Improvement');
+ await expect(field(page, 'Type').locator('select')).toHaveValue('Enhancement');
});
test('a response for an older title is ignored and the updated title is suggested', async ({ page, api, jev }) => {
@@ -62,8 +62,8 @@ test('a response for an older title is ignored and the updated title is suggeste
expect(JSON.parse(oldRequest.body.state)).toEqual({ title: 'An old bug report', description: '' });
expect(JSON.parse(newRequest.body.state)).toEqual({ title: 'Add a new dashboard', description: '' });
await expect(field(page, 'Type').locator('select')).toHaveValue('');
- jev.reply(newRequest, { Type: ['New Feature', 0.99], Priority: ['Normal', 0.99] });
- await expect(field(page, 'Type').locator('select')).toHaveValue('New Feature');
+ jev.reply(newRequest, { Type: ['Enhancement', 0.99], Priority: ['Normal', 0.99] });
+ await expect(field(page, 'Type').locator('select')).toHaveValue('Enhancement');
await expect(field(page, 'Priority').locator('select')).toHaveValue('Normal');
});
diff --git a/e2e-test/tests/jev-service-desk.spec.js b/e2e-test/tests/jev-service-desk.spec.js
index 2992125d1f..970cffc8ec 100644
--- a/e2e-test/tests/jev-service-desk.spec.js
+++ b/e2e-test/tests/jev-service-desk.spec.js
@@ -34,7 +34,7 @@ const test = base.extend({
{ name: 'Assignees', valueProvider: { '@type': 'ScriptingValue', scriptName } },
{ name: 'Type', valueProvider: { '@type': 'JevDecideValue', value: ['Support Request'] } },
{ name: 'Priority', valueProvider: { '@type': 'JevDecideValue', value: ['Normal'] } },
- { name: 'E2E Labels', valueProvider: { '@type': 'JevDecideValue', value: ['Improvement', 'Task'] } },
+ { name: 'E2E Labels', valueProvider: { '@type': 'JevDecideValue', value: ['Enhancement', 'Task'] } },
{ name: 'E2E Source', valueProvider: { '@type': 'SpecifiedValue', value: ['Email'] } },
];
try {
@@ -99,13 +99,13 @@ const scenarios = [
{
name: 'uncertain and unknown decisions retain configured fallbacks',
answers: { Type: ['Bug', 0.7499], Priority: ['unknown', 0.99], 'E2E Labels': ['Bug', 0.7499] },
- expected: { Type: 'Support Request', Priority: 'Normal', 'E2E Labels': ['Improvement', 'Task'] },
+ expected: { Type: 'Support Request', Priority: 'Normal', 'E2E Labels': ['Enhancement', 'Task'] },
assignee: 'supportAssignee',
},
{
name: 'Jev API failure still creates the issue using fallbacks', status: 503,
answers: { Type: ['Bug', 0.99], Priority: ['Major', 0.99], 'E2E Labels': ['Bug', 0.99] },
- expected: { Type: 'Support Request', Priority: 'Normal', 'E2E Labels': ['Improvement', 'Task'] },
+ expected: { Type: 'Support Request', Priority: 'Normal', 'E2E Labels': ['Enhancement', 'Task'] },
assignee: 'supportAssignee',
},
];
diff --git a/e2e-test/tests/select2-modal-scroll.spec.js b/e2e-test/tests/select2-modal-scroll.spec.js
index f4032f80c4..c93a6496cf 100644
--- a/e2e-test/tests/select2-modal-scroll.spec.js
+++ b/e2e-test/tests/select2-modal-scroll.spec.js
@@ -15,8 +15,8 @@ async function checkScrolledModal(page, testInfo, dark) {
await defaultValue.locator('.add-element').click();
const selection = defaultValue.locator('.select2-selection--single').first();
await selection.click();
- await modal.getByRole('option', { name: 'New Feature', exact: true }).click();
- await expect(selection).toHaveText('New Feature');
+ await modal.getByRole('option', { name: 'Enhancement', exact: true }).click();
+ await expect(selection).toHaveText('Enhancement');
await selection.scrollIntoViewIfNeeded();
await selection.evaluate(element => {
element.closest('.modal').scrollTop += element.getBoundingClientRect().top - window.innerHeight * 0.4;
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 08002d4a81..5b3b203742 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -54,6 +54,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import com.sun.management.OperatingSystemMXBean;
import com.thoughtworks.xstream.core.JVM;
@@ -9076,7 +9077,7 @@ public class DataMigrator {
var showCondition = new ShowCondition();
showCondition.setInputName("Type");
var valueIsOneOf = new ValueIsOneOf();
- valueIsOneOf.setValues(List.of("Build Failed"));
+ valueIsOneOf.setValues(Lists.newArrayList("Build Failed"));
showCondition.setValueMatcher(valueIsOneOf);
build.setShowCondition(showCondition);
fieldSpecsElement.add(beanToElement(build));
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index d8eb5183a2..46ffbc0e2f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -91,15 +91,10 @@ public class GlobalIssueSetting implements Serializable {
SpecifiedChoices specifiedChoices = new SpecifiedChoices();
List<Choice> choices = new ArrayList<>();
- Choice newFeature = new Choice();
- newFeature.setValue("New Feature");
- newFeature.setColor("#1bc5bd");
- choices.add(newFeature);
-
- Choice improvement = new Choice();
- improvement.setValue("Improvement");
- improvement.setColor("#1bc5bd");
- choices.add(improvement);
+ Choice enhancement = new Choice();
+ enhancement.setValue("Enhancement");
+ enhancement.setColor("#1bc5bd");
+ choices.add(enhancement);
Choice bug = new Choice();
bug.setValue("Bug");
@@ -128,6 +123,7 @@ public class GlobalIssueSetting implements Serializable {
ChoiceField priority = new ChoiceField();
priority.setName("Priority");
+ priority.setDescription("This field should be set to 'Normal' for most cases");
specifiedChoices = new SpecifiedChoices();
choices = new ArrayList<>();