Add latest changes from gitlab-org/gitlab@master

8 files changed, 16 insertions, 35 deletions

diff --git a/spec/frontend/ci/runner/components/runner_managers_detail_spec.js b/spec/frontend/ci/runner/components/runner_managers_detail_spec.js
index 3435292394f..6db9bb1d091 100644
--- a/spec/frontend/ci/runner/components/runner_managers_detail_spec.js
+++ b/spec/frontend/ci/runner/components/runner_managers_detail_spec.js
@@ -85,7 +85,7 @@ describe('RunnerJobs', () => {
     });
 
     it('is collapsed', () => {
-      expect(findCollapse().attributes('visible')).toBeUndefined();
+      expect(findCollapse().props('visible')).toBe(false);
     });
 
     describe('when expanded', () => {
@@ -99,7 +99,7 @@ describe('RunnerJobs', () => {
       });
 
       it('shows loading state', () => {
-        expect(findCollapse().attributes('visible')).toBe('true');
+        expect(findCollapse().props('visible')).toBe(true);
         expect(findSkeletonLoader().exists()).toBe(true);
       });
 
@@ -156,14 +156,14 @@ describe('RunnerJobs', () => {
     });
 
     it('shows rows', () => {
-      expect(findCollapse().attributes('visible')).toBe('true');
+      expect(findCollapse().props('visible')).toBe(true);
       expect(findRunnerManagersTable().props('items')).toEqual(mockRunnerManagers);
     });
 
     it('collapses when clicked', async () => {
       await findHideDetails().trigger('click');
 
-      expect(findCollapse().attributes('visible')).toBeUndefined();
+      expect(findCollapse().props('visible')).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/clusters/agents/components/integration_status_spec.js b/spec/frontend/clusters/agents/components/integration_status_spec.js
index 28a59391578..0f3da3e02be 100644
--- a/spec/frontend/clusters/agents/components/integration_status_spec.js
+++ b/spec/frontend/clusters/agents/components/integration_status_spec.js
@@ -58,7 +58,7 @@ describe('IntegrationStatus', () => {
     });
 
     it('sets collapse component as invisible by default', () => {
-      expect(findCollapse().props('visible')).toBeUndefined();
+      expect(findCollapse().props('visible')).toBe(false);
     });
   });
 
@@ -73,7 +73,7 @@ describe('IntegrationStatus', () => {
     });
 
     it('sets collapse component as visible', () => {
-      expect(findCollapse().attributes('visible')).toBe('true');
+      expect(findCollapse().props('visible')).toBe(true);
     });
   });
 
diff --git a/spec/frontend/content_editor/extensions/copy_paste_spec.js b/spec/frontend/content_editor/extensions/copy_paste_spec.js
index e290b4e5137..6969f4985a1 100644
--- a/spec/frontend/content_editor/extensions/copy_paste_spec.js
+++ b/spec/frontend/content_editor/extensions/copy_paste_spec.js
@@ -20,12 +20,6 @@ import waitForPromises from 'helpers/wait_for_promises';
 import MarkdownSerializer from '~/content_editor/services/markdown_serializer';
 import { createTestEditor, createDocBuilder, waitUntilNextDocTransaction } from '../test_utils';
 
-const CODE_BLOCK_HTML = '<pre class="js-syntax-highlight" lang="javascript">var a = 2;</pre>';
-const CODE_SUGGESTION_HTML =
-  '<pre data-lang-params="-0+0" class="js-syntax-highlight language-suggestion" lang="suggestion">Suggested code</pre>';
-const DIAGRAM_HTML =
-  '<img data-diagram="nomnoml" data-diagram-src="data:text/plain;base64,WzxmcmFtZT5EZWNvcmF0b3IgcGF0dGVybl0=">';
-const FRONTMATTER_HTML = '<pre lang="yaml" data-lang-params="frontmatter">key: value</pre>';
 const PARAGRAPH_HTML =
   '<p dir="auto">Some text with <strong>bold</strong> and <em>italic</em> text.</p>';
 
@@ -123,19 +117,6 @@ describe('content_editor/extensions/copy_paste', () => {
     expect(await triggerPasteEventHandler(buildClipboardEvent({ types, data }))).toBe(true);
   });
 
-  it.each`
-    nodeType            | html                    | handled  | desc
-    ${'codeBlock'}      | ${CODE_BLOCK_HTML}      | ${false} | ${'does not handle'}
-    ${'codeSuggestion'} | ${CODE_SUGGESTION_HTML} | ${false} | ${'does not handle'}
-    ${'diagram'}        | ${DIAGRAM_HTML}         | ${false} | ${'does not handle'}
-    ${'frontmatter'}    | ${FRONTMATTER_HTML}     | ${false} | ${'does not handle'}
-    ${'paragraph'}      | ${PARAGRAPH_HTML}       | ${true}  | ${'handles'}
-  `('$desc paste if currently a `$nodeType` is in focus', async ({ html, handled }) => {
-    tiptapEditor.commands.insertContent(html);
-
-    expect(await triggerPasteEventHandler(buildClipboardEvent())).toBe(handled);
-  });
-
   describe.each`
     eventName | expectedDoc
     ${'cut'}  | ${() => doc(p())}
diff --git a/spec/frontend/environments/deploy_board_wrapper_spec.js b/spec/frontend/environments/deploy_board_wrapper_spec.js
index 49eed68fa11..fec5032e31b 100644
--- a/spec/frontend/environments/deploy_board_wrapper_spec.js
+++ b/spec/frontend/environments/deploy_board_wrapper_spec.js
@@ -56,7 +56,7 @@ describe('~/environments/components/deploy_board_wrapper.vue', () => {
     });
 
     it('is collapsed by default', () => {
-      expect(collapse.attributes('visible')).toBeUndefined();
+      expect(collapse.props('visible')).toBe(false);
       expect(icon.props('name')).toBe('chevron-lg-right');
     });
 
@@ -64,7 +64,7 @@ describe('~/environments/components/deploy_board_wrapper.vue', () => {
       const button = await expandCollapsedSection();
 
       expect(button.attributes('aria-label')).toBe(__('Collapse'));
-      expect(collapse.attributes('visible')).toBe('visible');
+      expect(collapse.props('visible')).toBe(true);
       expect(icon.props('name')).toBe('chevron-lg-down');
 
       const deployBoard = findDeployBoard();
diff --git a/spec/frontend/environments/environment_folder_spec.js b/spec/frontend/environments/environment_folder_spec.js
index 1973613897d..e21e0f280ec 100644
--- a/spec/frontend/environments/environment_folder_spec.js
+++ b/spec/frontend/environments/environment_folder_spec.js
@@ -79,7 +79,7 @@ describe('~/environments/components/environments_folder.vue', () => {
       it('is collapsed by default', () => {
         const link = findLink();
 
-        expect(collapse.attributes('visible')).toBeUndefined();
+        expect(collapse.props('visible')).toBe(false);
         const iconNames = icons.wrappers.map((i) => i.props('name')).slice(0, 2);
         expect(iconNames).toEqual(['chevron-lg-right', 'folder-o']);
         expect(folderName.classes('gl-font-weight-bold')).toBe(false);
@@ -96,7 +96,7 @@ describe('~/environments/components/environments_folder.vue', () => {
         const link = findLink();
 
         expect(button.attributes('aria-label')).toBe(__('Collapse'));
-        expect(collapse.attributes('visible')).toBe('visible');
+        expect(collapse.props('visible')).toBe(true);
         const iconNames = icons.wrappers.map((i) => i.props('name')).slice(0, 2);
         expect(iconNames).toEqual(['chevron-lg-down', 'folder-open']);
         expect(folderName.classes('gl-font-weight-bold')).toBe(true);
diff --git a/spec/frontend/environments/kubernetes_overview_spec.js b/spec/frontend/environments/kubernetes_overview_spec.js
index 9f4a7518c47..e00cabd1066 100644
--- a/spec/frontend/environments/kubernetes_overview_spec.js
+++ b/spec/frontend/environments/kubernetes_overview_spec.js
@@ -74,7 +74,7 @@ describe('~/environments/components/kubernetes_overview.vue', () => {
     });
 
     it('is collapsed by default', () => {
-      expect(findCollapse().props('visible')).toBeUndefined();
+      expect(findCollapse().props('visible')).toBe(false);
       expect(findCollapseButton().attributes('aria-label')).toBe(KubernetesOverview.i18n.expand);
       expect(findCollapseButton().props('icon')).toBe('chevron-right');
     });
@@ -88,7 +88,7 @@ describe('~/environments/components/kubernetes_overview.vue', () => {
       findCollapseButton().vm.$emit('click');
       await nextTick();
 
-      expect(findCollapse().attributes('visible')).toBe('true');
+      expect(findCollapse().props('visible')).toBe(true);
       expect(findCollapseButton().attributes('aria-label')).toBe(KubernetesOverview.i18n.collapse);
       expect(findCollapseButton().props('icon')).toBe('chevron-down');
     });
diff --git a/spec/frontend/environments/new_environment_item_spec.js b/spec/frontend/environments/new_environment_item_spec.js
index e586bbfc59d..552c44fe197 100644
--- a/spec/frontend/environments/new_environment_item_spec.js
+++ b/spec/frontend/environments/new_environment_item_spec.js
@@ -382,7 +382,7 @@ describe('~/environments/components/new_environment_item.vue', () => {
     });
 
     it('is collapsed by default', () => {
-      expect(collapse.attributes('visible')).toBeUndefined();
+      expect(collapse.props('visible')).toBe(false);
       expect(icon.props('name')).toBe('chevron-lg-right');
       expect(environmentName.classes('gl-font-weight-bold')).toBe(false);
     });
@@ -394,7 +394,7 @@ describe('~/environments/components/new_environment_item.vue', () => {
 
       expect(button.attributes('aria-label')).toBe(__('Collapse'));
       expect(button.props('category')).toBe('secondary');
-      expect(collapse.attributes('visible')).toBe('visible');
+      expect(collapse.props('visible')).toBe(true);
       expect(icon.props('name')).toBe('chevron-lg-down');
       expect(environmentName.classes('gl-font-weight-bold')).toBe(true);
       expect(findDeployment().isVisible()).toBe(true);
diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js
index 8eaed998eb5..5a5d29d3194 100644
--- a/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_expandable_section_spec.js
@@ -39,7 +39,7 @@ describe('MrWidgetExpanableSection', () => {
       const collapse = findCollapse();
 
       expect(collapse.exists()).toBe(true);
-      expect(collapse.attributes('visible')).toBeUndefined();
+      expect(collapse.props('visible')).toBe(false);
     });
   });
 
@@ -60,7 +60,7 @@ describe('MrWidgetExpanableSection', () => {
       const collapse = findCollapse();
 
       expect(collapse.exists()).toBe(true);
-      expect(collapse.attributes('visible')).toBe('true');
+      expect(collapse.props('visible')).toBe(true);
     });
   });
 });