Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 4 deletions

diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer_spec.js
index 2bbd3572d4b..a90d3528d60 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer_spec.js
@@ -70,10 +70,11 @@ describe('HTMLToMarkdownRenderer', () => {
 
   describe('OL LI visitor', () => {
     it.each`
-      listItem            | result              | incrementListMarker | action
-      ${'2. list item'}   | ${'1. list item'}   | ${false}            | ${'increments'}
-      ${'  3. list item'} | ${'  1. list item'} | ${false}            | ${'increments'}
-      ${'3. list item'}   | ${'3. list item'}   | ${true}             | ${'does not increment'}
+      listItem              | result              | incrementListMarker | action
+      ${'2. list item'}     | ${'1. list item'}   | ${false}            | ${'increments'}
+      ${'  3. list item'}   | ${'  1. list item'} | ${false}            | ${'increments'}
+      ${'  123. list item'} | ${'  1. list item'} | ${false}            | ${'increments'}
+      ${'3. list item'}     | ${'3. list item'}   | ${true}             | ${'does not increment'}
     `(
       '$action a list item counter when incrementListMaker is $incrementListMarker',
       ({ listItem, result, incrementListMarker }) => {
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_softbreak_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_softbreak_spec.js
new file mode 100644
index 00000000000..3c3d2354cb9
--- /dev/null
+++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_softbreak_spec.js
@@ -0,0 +1,23 @@
+import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_softbreak';
+
+describe('Render softbreak renderer', () => {
+  describe('canRender', () => {
+    it.each`
+      node                                 | parentType     | result
+      ${{ parent: { type: 'emph' } }}      | ${'emph'}      | ${true}
+      ${{ parent: { type: 'strong' } }}    | ${'strong'}    | ${true}
+      ${{ parent: { type: 'paragraph' } }} | ${'paragraph'} | ${false}
+    `('returns $result when node parent type is $parentType ', ({ node, result }) => {
+      expect(renderer.canRender(node)).toBe(result);
+    });
+  });
+
+  describe('render', () => {
+    it('returns text node with a break line', () => {
+      expect(renderer.render()).toEqual({
+        type: 'text',
+        content: ' ',
+      });
+    });
+  });
+});