The Unified and Autonomous Development Platform
feat: Enhance issue creation and modal behavior in E2E tests
Robin Shen2b8d63c5abc7
diff --git a/e2e-test/tests/api.js b/e2e-test/tests/api.jsindex 9eba9a5dd5..355280c3d8 100644--- a/e2e-test/tests/api.js+++ b/e2e-test/tests/api.js@@ -56,7 +56,9 @@ export class FixturesApi {async createIssue(project, { title = `Issue ${randomUUID()}`, description, confidential = false, fields = {}, creator } = {}) {const id = await this.json('post', '~api/issues', {- data: { projectId: project.id, title, description, confidential, fields },+ // 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 } },...(creator ? { headers: credentials(creator) } : {}),});const issue = await this.json('get', `~api/issues/${id}`);diff --git a/e2e-test/tests/select2-modal-scroll.spec.js b/e2e-test/tests/select2-modal-scroll.spec.jsindex 58780857b8..f4032f80c4 100644--- a/e2e-test/tests/select2-modal-scroll.spec.js+++ b/e2e-test/tests/select2-modal-scroll.spec.js@@ -7,7 +7,15 @@ async function checkScrolledModal(page, testInfo, dark) {await page.evaluate(dark => $('html').toggleClass('dark-mode', dark), dark);await page.locator('.issue-fields').getByRole('link', { name: 'Type', exact: true }).click();const modal = page.locator('.modal.show');- const selection = modal.locator('.property-defaultValueProvider .select2-selection--single');+ const defaultValue = modal.locator('.property-defaultValueProvider');+ // Create an unsaved default explicitly; built-in fields no longer have one.+ await defaultValue.locator('.type-selector > select').selectOption({ label: 'Use specified default value' });+ await expect(defaultValue.locator('.add-element')).toBeVisible();+ if (await defaultValue.locator('.select2-selection--single').count() === 0)+ 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 selection.scrollIntoViewIfNeeded();await selection.evaluate(element => {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.javaindex f381c5beef..d8eb5183a2 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@@ -12,9 +12,6 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import jakarta.validation.Valid;-import jakarta.validation.constraints.NotNull;-import org.jspecify.annotations.Nullable;import com.google.common.collect.Lists;@@ -38,8 +35,6 @@ import io.onedev.server.model.support.issue.TimeTrackingSetting;import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;-import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.DefaultValue;-import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.model.support.issue.transitionspec.BranchCreatedSpec;import io.onedev.server.model.support.issue.transitionspec.BranchUpdatedSpec;@@ -56,6 +51,8 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResoimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;+import jakarta.validation.Valid;+import jakarta.validation.constraints.NotNull;@Editablepublic class GlobalIssueSetting implements Serializable {@@ -126,14 +123,7 @@ public class GlobalIssueSetting implements Serializable {specifiedChoices.setChoices(choices);type.setChoiceProvider(specifiedChoices);-- SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();- DefaultValue defaultValue = new DefaultValue();- defaultValue.setValue("New Feature");- specifiedDefaultValue.getDefaultValues().add(defaultValue);-- type.setDefaultValueProvider(specifiedDefaultValue);-+fieldSpecs.add(type);ChoiceField priority = new ChoiceField();@@ -164,13 +154,7 @@ public class GlobalIssueSetting implements Serializable {specifiedChoices.setChoices(choices);priority.setChoiceProvider(specifiedChoices);-- specifiedDefaultValue = new SpecifiedDefaultValue();- defaultValue = new DefaultValue();- defaultValue.setValue("Normal");- specifiedDefaultValue.getDefaultValues().add(defaultValue);- priority.setDefaultValueProvider(specifiedDefaultValue);-+fieldSpecs.add(priority);UserChoiceField assignees = new UserChoiceField();