Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 16 deletions

diff --git a/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js b/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js
index 3964d895b4b..ff4c66e534b 100644
--- a/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js
@@ -9,6 +9,7 @@ import ContentEditor from '~/content_editor/components/content_editor.vue';
 import BubbleMenu from '~/content_editor/components/bubble_menus/bubble_menu.vue';
 import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
+import { assertProps } from 'helpers/assert_props';
 import { stubComponent } from 'helpers/stub_component';
 import { useLocalStorageSpy } from 'helpers/local_storage_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -33,23 +34,26 @@ describe('vue_shared/component/markdown/markdown_editor', () => {
   const autocompleteDataSources = { commands: '/foobar/-/autcomplete_sources' };
   let mock;
 
+  const defaultProps = {
+    value,
+    renderMarkdownPath,
+    markdownDocsPath,
+    quickActionsDocsPath,
+    enableAutocomplete,
+    autocompleteDataSources,
+    enablePreview,
+    formFieldProps: {
+      id: formFieldId,
+      name: formFieldName,
+      placeholder: formFieldPlaceholder,
+      'aria-label': formFieldAriaLabel,
+    },
+  };
   const buildWrapper = ({ propsData = {}, attachTo, stubs = {} } = {}) => {
     wrapper = mountExtended(MarkdownEditor, {
       attachTo,
       propsData: {
-        value,
-        renderMarkdownPath,
-        markdownDocsPath,
-        quickActionsDocsPath,
-        enableAutocomplete,
-        autocompleteDataSources,
-        enablePreview,
-        formFieldProps: {
-          id: formFieldId,
-          name: formFieldName,
-          placeholder: formFieldPlaceholder,
-          'aria-label': formFieldAriaLabel,
-        },
+        ...defaultProps,
         ...propsData,
       },
       stubs: {
@@ -244,9 +248,9 @@ describe('vue_shared/component/markdown/markdown_editor', () => {
   });
 
   it('fails to render if textarea id and name is not passed', () => {
-    expect(() => {
-      buildWrapper({ propsData: { formFieldProps: {} } });
-    }).toThrow('Invalid prop: custom validator check failed for prop "formFieldProps"');
+    expect(() => assertProps(MarkdownEditor, { ...defaultProps, formFieldProps: {} })).toThrow(
+      'Invalid prop: custom validator check failed for prop "formFieldProps"',
+    );
   });
 
   it(`emits ${EDITING_MODE_CONTENT_EDITOR} event when enableContentEditor emitted from markdown editor`, async () => {