Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 4 deletions

diff --git a/spec/frontend/content_editor/extensions/frontmatter_spec.js b/spec/frontend/content_editor/extensions/frontmatter_spec.js
index 517f6947b9a..a8cbad6ef81 100644
--- a/spec/frontend/content_editor/extensions/frontmatter_spec.js
+++ b/spec/frontend/content_editor/extensions/frontmatter_spec.js
@@ -1,30 +1,47 @@
 import Frontmatter from '~/content_editor/extensions/frontmatter';
+import CodeBlockHighlight from '~/content_editor/extensions/code_block_highlight';
 import { createTestEditor, createDocBuilder, triggerNodeInputRule } from '../test_utils';
 
 describe('content_editor/extensions/frontmatter', () => {
   let tiptapEditor;
   let doc;
-  let p;
+  let frontmatter;
+  let codeBlock;
 
   beforeEach(() => {
-    tiptapEditor = createTestEditor({ extensions: [Frontmatter] });
+    tiptapEditor = createTestEditor({ extensions: [Frontmatter, CodeBlockHighlight] });
 
     ({
-      builders: { doc, p },
+      builders: { doc, codeBlock, frontmatter },
     } = createDocBuilder({
       tiptapEditor,
       names: {
         frontmatter: { nodeType: Frontmatter.name },
+        codeBlock: { nodeType: CodeBlockHighlight.name },
       },
     }));
   });
 
   it('does not insert a frontmatter block when executing code block input rule', () => {
-    const expectedDoc = doc(p(''));
+    const expectedDoc = doc(codeBlock(''));
     const inputRuleText = '``` ';
 
     triggerNodeInputRule({ tiptapEditor, inputRuleText });
 
     expect(tiptapEditor.getJSON()).toEqual(expectedDoc.toJSON());
   });
+
+  it.each`
+    command                | result                        | resultDesc
+    ${'toggleCodeBlock'}   | ${() => doc(codeBlock(''))}   | ${'code block element'}
+    ${'setCodeBlock'}      | ${() => doc(codeBlock(''))}   | ${'code block element'}
+    ${'setFrontmatter'}    | ${() => doc(frontmatter(''))} | ${'frontmatter element'}
+    ${'toggleFrontmatter'} | ${() => doc(frontmatter(''))} | ${'frontmatter element'}
+  `('executing $command should generate a document with a $resultDesc', ({ command, result }) => {
+    const expectedDoc = result();
+
+    tiptapEditor.commands[command]();
+
+    expect(tiptapEditor.getJSON()).toEqual(expectedDoc.toJSON());
+  });
 });