Add latest changes from gitlab-org/gitlab@master

4 files changed, 7 insertions, 7 deletions

diff --git a/spec/frontend/vue_shared/components/markdown/header_spec.js b/spec/frontend/vue_shared/components/markdown/header_spec.js
index 8a9af812c89..eccf5df82d3 100644
--- a/spec/frontend/vue_shared/components/markdown/header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/header_spec.js
@@ -21,7 +21,7 @@ describe('Markdown field header component', () => {
   const findWriteTab = () => wrapper.findByTestId('write-tab');
   const findPreviewTab = () => wrapper.findByTestId('preview-tab');
   const findToolbar = () => wrapper.findByTestId('md-header-toolbar');
-  const findToolbarButtons = () => wrapper.findAll(ToolbarButton);
+  const findToolbarButtons = () => wrapper.findAllComponents(ToolbarButton);
   const findToolbarButtonByProp = (prop, value) =>
     findToolbarButtons()
       .filter((button) => button.props(prop) === value)
diff --git a/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js b/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
index 9944267cf24..9db1b779a04 100644
--- a/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
@@ -38,13 +38,13 @@ describe('Suggestion Diff component', () => {
     wrapper.destroy();
   });
 
-  const findApplyButton = () => wrapper.find(ApplySuggestion);
+  const findApplyButton = () => wrapper.findComponent(ApplySuggestion);
   const findApplyBatchButton = () => wrapper.find('.js-apply-batch-btn');
   const findAddToBatchButton = () => wrapper.find('.js-add-to-batch-btn');
   const findRemoveFromBatchButton = () => wrapper.find('.js-remove-from-batch-btn');
   const findHeader = () => wrapper.find('.js-suggestion-diff-header');
   const findHelpButton = () => wrapper.find('.js-help-btn');
-  const findLoading = () => wrapper.find(GlLoadingIcon);
+  const findLoading = () => wrapper.findComponent(GlLoadingIcon);
 
   it('renders a suggestion header', () => {
     createComponent();
diff --git a/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js b/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js
index af27e953776..d84483c1663 100644
--- a/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js
@@ -71,7 +71,7 @@ describe('Suggestion Diff component', () => {
   });
 
   it('renders a correct amount of suggestion diff rows', () => {
-    expect(wrapper.findAll(SuggestionDiffRow)).toHaveLength(3);
+    expect(wrapper.findAllComponents(SuggestionDiffRow)).toHaveLength(3);
   });
 
   it.each`
@@ -81,14 +81,14 @@ describe('Suggestion Diff component', () => {
     ${'addToBatch'}      | ${[]}             | ${[suggestionId]}
     ${'removeFromBatch'} | ${[]}             | ${[suggestionId]}
   `('emits $event event on sugestion diff header $event', ({ event, childArgs, args }) => {
-    wrapper.find(SuggestionDiffHeader).vm.$emit(event, ...childArgs);
+    wrapper.findComponent(SuggestionDiffHeader).vm.$emit(event, ...childArgs);
 
     expect(wrapper.emitted(event)).toBeDefined();
     expect(wrapper.emitted(event)).toEqual([args]);
   });
 
   it('passes suggestion batch props to suggestion diff header', () => {
-    expect(wrapper.find(SuggestionDiffHeader).props()).toMatchObject({
+    expect(wrapper.findComponent(SuggestionDiffHeader).props()).toMatchObject({
       batchSuggestionsCount: 1,
       isBatched: true,
       isApplyingBatch: MOCK_DATA.suggestion.is_applying_batch,
diff --git a/spec/frontend/vue_shared/components/markdown/toolbar_button_spec.js b/spec/frontend/vue_shared/components/markdown/toolbar_button_spec.js
index 19e4f2d8c92..82210e79799 100644
--- a/spec/frontend/vue_shared/components/markdown/toolbar_button_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/toolbar_button_spec.js
@@ -26,7 +26,7 @@ describe('toolbar_button', () => {
   });
 
   const getButtonShortcutsAttr = () => {
-    return wrapper.find(GlButton).attributes('data-md-shortcuts');
+    return wrapper.findComponent(GlButton).attributes('data-md-shortcuts');
   };
 
   describe('keyboard shortcuts', () => {