Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/frontend/content_editor/services/markdown_serializer_spec.js b/spec/frontend/content_editor/services/markdown_serializer_spec.js
index 97f6d8f6334..01d4c994e88 100644
--- a/spec/frontend/content_editor/services/markdown_serializer_spec.js
+++ b/spec/frontend/content_editor/services/markdown_serializer_spec.js
@@ -164,6 +164,17 @@ describe('markdownSerializer', () => {
     expect(serialize(paragraph(italic('italics')))).toBe('_italics_');
   });
 
+  it('correctly serializes code blocks wrapped by italics and bold marks', () => {
+    const text = 'code block';
+
+    expect(serialize(paragraph(italic(code(text))))).toBe(`_\`${text}\`_`);
+    expect(serialize(paragraph(code(italic(text))))).toBe(`_\`${text}\`_`);
+    expect(serialize(paragraph(bold(code(text))))).toBe(`**\`${text}\`**`);
+    expect(serialize(paragraph(code(bold(text))))).toBe(`**\`${text}\`**`);
+    expect(serialize(paragraph(strike(code(text))))).toBe(`~~\`${text}\`~~`);
+    expect(serialize(paragraph(code(strike(text))))).toBe(`~~\`${text}\`~~`);
+  });
+
   it('correctly serializes inline diff', () => {
     expect(
       serialize(
@@ -341,6 +352,10 @@ this is not really json but just trying out whether this case works or not
     );
   });
 
+  it('does not serialize an image when src and canonicalSrc are empty', () => {
+    expect(serialize(paragraph(image({})))).toBe('');
+  });
+
   it('correctly serializes an image with a title', () => {
     expect(serialize(paragraph(image({ src: 'img.jpg', title: 'baz', alt: 'foo bar' })))).toBe(
       '![foo bar](img.jpg "baz")',