diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 20:35:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-16 20:35:23 +0300 |
commit | 67531b6892b1effd47b40d0c35b583dd586faa72 (patch) | |
tree | 409a4d8251ac95e41e0f89bbd92254e1cbcb436d /spec/frontend | |
parent | 3562e58c753b662e5ec0b7b042fbbd5d49907aa8 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-ee
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/issues/create_merge_request_dropdown_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/issues/create_merge_request_dropdown_spec.js b/spec/frontend/issues/create_merge_request_dropdown_spec.js index 637b4d31999..c2cfb16fdf7 100644 --- a/spec/frontend/issues/create_merge_request_dropdown_spec.js +++ b/spec/frontend/issues/create_merge_request_dropdown_spec.js @@ -59,7 +59,7 @@ describe('CreateMergeRequestDropdown', () => { describe('updateCreatePaths', () => { it('escapes branch names correctly', () => { dropdown.createBranchPath = `${TEST_HOST}/branches?branch_name=some-branch&issue=42`; - dropdown.createMrPath = `${TEST_HOST}/create_merge_request?merge_request%5Bsource_branch%5D=test&merge_request%5Btarget_branch%5D=master`; + dropdown.createMrPath = `${TEST_HOST}/create_merge_request?merge_request%5Bsource_branch%5D=test&merge_request%5Btarget_branch%5D=master&merge_request%5Bissue_iid%5D=42`; dropdown.updateCreatePaths('branch', 'contains#hash'); @@ -68,7 +68,7 @@ describe('CreateMergeRequestDropdown', () => { ); expect(dropdown.createMrPath).toBe( - `${TEST_HOST}/create_merge_request?merge_request%5Bsource_branch%5D=contains%23hash&merge_request%5Btarget_branch%5D=master`, + `${TEST_HOST}/create_merge_request?merge_request%5Bsource_branch%5D=contains%23hash&merge_request%5Btarget_branch%5D=master&merge_request%5Bissue_iid%5D=42`, ); }); }); |