Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
index b866cf8bc03..d6b53261172 100644
--- a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
+++ b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
@@ -126,6 +126,20 @@ describe('JiraIssuesFields', () => {
         },
       );
 
+      it('passes down the correct initial-issue-type-id value when value is empty', async () => {
+        await setEnableCheckbox(true);
+        expect(findJiraForVulnerabilities().attributes('initial-issue-type-id')).toBeUndefined();
+      });
+
+      it('passes down the correct initial-issue-type-id value when value is not empty', async () => {
+        const jiraIssueType = 'some-jira-issue-type';
+        wrapper.setProps({ initialVulnerabilitiesIssuetype: jiraIssueType });
+        await setEnableCheckbox(true);
+        expect(findJiraForVulnerabilities().attributes('initial-issue-type-id')).toBe(
+          jiraIssueType,
+        );
+      });
+
       it('emits "getJiraIssueTypes" to the eventHub when the jira-vulnerabilities component requests to fetch issue types', async () => {
         const eventHubEmitSpy = jest.spyOn(eventHub, '$emit');