Add latest changes from gitlab-org/gitlab@master

2 files changed, 58 insertions, 23 deletions

diff --git a/spec/frontend/content_editor/services/markdown_serializer_spec.js b/spec/frontend/content_editor/services/markdown_serializer_spec.js
index 24b3779057c..868473faa14 100644
--- a/spec/frontend/content_editor/services/markdown_serializer_spec.js
+++ b/spec/frontend/content_editor/services/markdown_serializer_spec.js
@@ -115,6 +115,64 @@ describe('markdownSerializer', () => {
     expect(serialize(paragraph('hello', hardBreak(), 'world'))).toBe('hello\\\nworld');
   });
 
+  it('correctly serializes a link', () => {
+    expect(serialize(paragraph(link({ href: 'https://example.com' }, 'example url')))).toBe(
+      '[example url](https://example.com)',
+    );
+  });
+
+  it('correctly serializes a link with a title', () => {
+    expect(
+      serialize(
+        paragraph(link({ href: 'https://example.com', title: 'click this link' }, 'example url')),
+      ),
+    ).toBe('[example url](https://example.com "click this link")');
+  });
+
+  it('correctly serializes a link with a canonicalSrc', () => {
+    expect(
+      serialize(
+        paragraph(
+          link(
+            {
+              href: '/uploads/abcde/file.zip',
+              canonicalSrc: 'file.zip',
+              title: 'click here to download',
+            },
+            'download file',
+          ),
+        ),
+      ),
+    ).toBe('[download file](file.zip "click here to download")');
+  });
+
+  it('correctly serializes an image', () => {
+    expect(serialize(paragraph(image({ src: 'img.jpg', alt: 'foo bar' })))).toBe(
+      '![foo bar](img.jpg)',
+    );
+  });
+
+  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")',
+    );
+  });
+
+  it('correctly serializes an image with a canonicalSrc', () => {
+    expect(
+      serialize(
+        paragraph(
+          image({
+            src: '/uploads/abcde/file.png',
+            alt: 'this is an image',
+            canonicalSrc: 'file.png',
+            title: 'foo bar baz',
+          }),
+        ),
+      ),
+    ).toBe('![this is an image](file.png "foo bar baz")');
+  });
+
   it('correctly serializes a table with inline content', () => {
     expect(
       serialize(
diff --git a/spec/frontend/lib/utils/url_utility_spec.js b/spec/frontend/lib/utils/url_utility_spec.js
index c8ac7ffc9d9..6f186ba3227 100644
--- a/spec/frontend/lib/utils/url_utility_spec.js
+++ b/spec/frontend/lib/utils/url_utility_spec.js
@@ -645,29 +645,6 @@ describe('URL utility', () => {
     });
   });
 
-  describe('urlParamsToObject', () => {
-    it('parses path for label with trailing +', () => {
-      // eslint-disable-next-line import/no-deprecated
-      expect(urlUtils.urlParamsToObject('label_name[]=label%2B', {})).toEqual({
-        label_name: ['label+'],
-      });
-    });
-
-    it('parses path for milestone with trailing +', () => {
-      // eslint-disable-next-line import/no-deprecated
-      expect(urlUtils.urlParamsToObject('milestone_title=A%2B', {})).toEqual({
-        milestone_title: 'A+',
-      });
-    });
-
-    it('parses path for search terms with spaces', () => {
-      // eslint-disable-next-line import/no-deprecated
-      expect(urlUtils.urlParamsToObject('search=two+words', {})).toEqual({
-        search: 'two words',
-      });
-    });
-  });
-
   describe('queryToObject', () => {
     it.each`
       case                                                                      | query                               | options                                             | result