diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-04 01:23:33 +0300 |
commit | 6c3124c854cbeef391a38b5ae8330174d78348bf (patch) | |
tree | af77629bc34ccc517ed24d9db35895be5d02d23d /spec/frontend | |
parent | 9a8ae3b4e90e56f71bb770463b943512efdcd1d1 (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-ee
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/issues/show/utils_spec.js | 116 | ||||
-rw-r--r-- | spec/frontend/notes/components/comment_form_spec.js | 20 |
2 files changed, 128 insertions, 8 deletions
diff --git a/spec/frontend/issues/show/utils_spec.js b/spec/frontend/issues/show/utils_spec.js index e5f14cfc01a..603fb5cc2a6 100644 --- a/spec/frontend/issues/show/utils_spec.js +++ b/spec/frontend/issues/show/utils_spec.js @@ -2,7 +2,7 @@ import { convertDescriptionWithNewSort } from '~/issues/show/utils'; describe('app/assets/javascripts/issues/show/utils.js', () => { describe('convertDescriptionWithNewSort', () => { - it('converts markdown description with new list sort order', () => { + it('converts markdown description with nested lists with new list sort order', () => { const description = `I am text - Item 1 @@ -12,17 +12,17 @@ describe('app/assets/javascripts/issues/show/utils.js', () => { - Item 5`; // Drag Item 2 + children to Item 1's position - const html = `<ul data-sourcepos="3:1-8:0"> - <li data-sourcepos="4:1-4:8"> + const html = `<ul data-sourcepos="3:1-7:8"> + <li data-sourcepos="4:1-6:10"> Item 2 - <ul data-sourcepos="5:1-6:10"> - <li data-sourcepos="5:1-5:10">Item 3</li> - <li data-sourcepos="6:1-6:10">Item 4</li> + <ul data-sourcepos="5:3-6:10"> + <li data-sourcepos="5:3-5:10">Item 3</li> + <li data-sourcepos="6:3-6:10">Item 4</li> </ul> </li> <li data-sourcepos="3:1-3:8">Item 1</li> - <li data-sourcepos="7:1-8:0">Item 5</li> - <ul>`; + <li data-sourcepos="7:1-7:8">Item 5</li> + </ul>`; const list = document.createElement('div'); list.innerHTML = html; @@ -36,5 +36,105 @@ describe('app/assets/javascripts/issues/show/utils.js', () => { expect(convertDescriptionWithNewSort(description, list.firstChild)).toBe(expected); }); + + it('converts markdown description with multi-line list items with new list sort order', () => { + const description = `Labore ea omnis et officia excepturi. + +1. Item 1 + + Item 1 part 2 + +1. Item 2 + - Item 2.1 + - Item 2.1.1 + - Item 2.1.2 + - Item 2.2 + - Item 2.3 +1. Item 3 +1. Item 4 + + \`\`\` + const variable = 'string'; + \`\`\` + + ![iii](img.jpg) + + last paragraph + +1. Item 5 +1. Item 6`; + + // Drag Item 2 + children to Item 5's position + const html = `<ol data-sourcepos="3:1-25:7"> + <li data-sourcepos="3:1-6:0"> + <p data-sourcepos="3:4-3:7">Item 1</p> + <p data-sourcepos="5:4-5:8">Item 1 part 2</p> + </li> + <li data-sourcepos="13:1-13:7"> + <p data-sourcepos="13:4-13:7">Item 3</p> + </li> + <li data-sourcepos="14:1-23:0"> + <p data-sourcepos="14:4-14:7">Item 4</p> + <div> + <pre data-sourcepos="16:4-18:6"> + <code><span lang="plaintext">const variabl = 'string';</span></code> + </pre> + </div> + <p data-sourcepos="20:4-20:32"> + <a href="href"><img src="img.jpg" alt="description" /></a> + </p> + <p data-sourcepos="22:4-22:17">last paragraph</p> + </li> + <li data-sourcepos="24:1-24:7"> + <p data-sourcepos="24:4-24:7">Item 5</p> + </li> + <li data-sourcepos="7:1-12:10"> + <p data-sourcepos="7:4-7:7">Item 2</p> + <ul data-sourcepos="8:4-12:10"> + <li data-sourcepos="8:4-10:15">Item 2.1 + <ul data-sourcepos="9:6-10:15"> + <li data-sourcepos="9:6-9:12">Item 2.1.1</li> + <li data-sourcepos="10:6-10:15">Item 2.1.2</li> + </ul> + </li> + <li data-sourcepos="11:4-11:10">Item 2.2</li> + <li data-sourcepos="12:4-12:10">Item 2.3</li> + </ul> + </li> + <li data-sourcepos="25:1-25:7"> + <p data-sourcepos="25:4-25:7">Item 6</p> + </li> + </ol>`; + const list = document.createElement('div'); + list.innerHTML = html; + + const expected = `Labore ea omnis et officia excepturi. + +1. Item 1 + + Item 1 part 2 + +1. Item 3 +1. Item 4 + + \`\`\` + const variable = 'string'; + \`\`\` + + ![iii](img.jpg) + + last paragraph + +1. Item 5 +1. Item 2 + - Item 2.1 + - Item 2.1.1 + - Item 2.1.2 + - Item 2.2 + - Item 2.3 +1. Item 6`; + + expect(convertDescriptionWithNewSort(description, list.firstChild)).toBe(expected); + }); }); }); diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js index fb42e4d1d84..ba5d4d27e55 100644 --- a/spec/frontend/notes/components/comment_form_spec.js +++ b/spec/frontend/notes/components/comment_form_spec.js @@ -582,6 +582,26 @@ describe('issue_comment_form component', () => { expect(checkbox.element.checked).toBe(false); }); + it.each` + noteableType | rendered | message + ${'Issue'} | ${true} | ${'render'} + ${'Epic'} | ${true} | ${'render'} + ${'MergeRequest'} | ${false} | ${'not render'} + `( + 'should $message checkbox when noteableType is $noteableType', + ({ noteableType, rendered }) => { + mountComponent({ + mountFunction: mount, + noteableType, + initialData: { note: 'internal note' }, + noteableData: { ...notableDataMockCanUpdateIssuable, noteableType }, + features, + }); + + expect(findConfidentialNoteCheckbox().exists()).toBe(rendered); + }, + ); + describe.each` shouldCheckboxBeChecked ${true} |