Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 0 deletions

diff --git a/spec/frontend/content_editor/services/asset_resolver_spec.js b/spec/frontend/content_editor/services/asset_resolver_spec.js
index f4e7d9bf881..0a99f823be3 100644
--- a/spec/frontend/content_editor/services/asset_resolver_spec.js
+++ b/spec/frontend/content_editor/services/asset_resolver_spec.js
@@ -20,4 +20,14 @@ describe('content_editor/services/asset_resolver', () => {
       );
     });
   });
+
+  describe('renderDiagram', () => {
+    it('resolves a diagram code to a url containing the diagram image', async () => {
+      renderMarkdown.mockResolvedValue(
+        '<p><img data-diagram="nomnoml" src="url/to/some/diagram"></p>',
+      );
+
+      expect(await assetResolver.renderDiagram('test')).toBe('url/to/some/diagram');
+    });
+  });
 });
diff --git a/spec/frontend/content_editor/services/code_block_language_loader_spec.js b/spec/frontend/content_editor/services/code_block_language_loader_spec.js
index 9b2600f85d9..795f5219a3f 100644
--- a/spec/frontend/content_editor/services/code_block_language_loader_spec.js
+++ b/spec/frontend/content_editor/services/code_block_language_loader_spec.js
@@ -35,6 +35,13 @@ describe('content_editor/services/code_block_language_loader', () => {
       });
     });
 
+    it('returns Diagram (syntax) if the language does not exist, and isDiagram = true', () => {
+      expect(languageLoader.findOrCreateLanguageBySyntax('foobar', true)).toMatchObject({
+        syntax: 'foobar',
+        label: 'Diagram (foobar)',
+      });
+    });
+
     it('returns plaintext if no syntax is passed', () => {
       expect(languageLoader.findOrCreateLanguageBySyntax('')).toMatchObject({
         syntax: 'plaintext',