Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

3 files changed, 16 insertions, 15 deletions

diff --git a/spec/frontend/projects/pipelines/charts/components/app_spec.js b/spec/frontend/projects/pipelines/charts/components/app_spec.js
index 7b9011fa3d9..e3aaf760d1e 100644
--- a/spec/frontend/projects/pipelines/charts/components/app_spec.js
+++ b/spec/frontend/projects/pipelines/charts/components/app_spec.js
@@ -47,15 +47,16 @@ describe('ProjectsPipelinesChartsApp', () => {
     wrapper.destroy();
   });
 
-  const findGlTabs = () => wrapper.find(GlTabs);
-  const findAllGlTabs = () => wrapper.findAll(GlTab);
+  const findGlTabs = () => wrapper.findComponent(GlTabs);
+  const findAllGlTabs = () => wrapper.findAllComponents(GlTab);
   const findGlTabAtIndex = (index) => findAllGlTabs().at(index);
-  const findLeadTimeCharts = () => wrapper.find(LeadTimeChartsStub);
-  const findTimeToRestoreServiceCharts = () => wrapper.find(TimeToRestoreServiceChartsStub);
-  const findChangeFailureRateCharts = () => wrapper.find(ChangeFailureRateChartsStub);
-  const findDeploymentFrequencyCharts = () => wrapper.find(DeploymentFrequencyChartsStub);
-  const findPipelineCharts = () => wrapper.find(PipelineCharts);
-  const findProjectQualitySummary = () => wrapper.find(ProjectQualitySummaryStub);
+  const findLeadTimeCharts = () => wrapper.findComponent(LeadTimeChartsStub);
+  const findTimeToRestoreServiceCharts = () =>
+    wrapper.findComponent(TimeToRestoreServiceChartsStub);
+  const findChangeFailureRateCharts = () => wrapper.findComponent(ChangeFailureRateChartsStub);
+  const findDeploymentFrequencyCharts = () => wrapper.findComponent(DeploymentFrequencyChartsStub);
+  const findPipelineCharts = () => wrapper.findComponent(PipelineCharts);
+  const findProjectQualitySummary = () => wrapper.findComponent(ProjectQualitySummaryStub);
 
   describe('when all charts are available', () => {
     beforeEach(() => {
diff --git a/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js b/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js
index 7bb289408b8..8c18d2992ea 100644
--- a/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js
+++ b/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js
@@ -81,7 +81,7 @@ describe('~/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue', (
     it('should select a different chart on change', async () => {
       findSegmentedControl().vm.$emit('input', 1);
 
-      const chart = wrapper.find(CiCdAnalyticsAreaChart);
+      const chart = wrapper.findComponent(CiCdAnalyticsAreaChart);
 
       await nextTick();
 
@@ -92,7 +92,7 @@ describe('~/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue', (
 
   it('should not display charts if there are no charts', () => {
     wrapper = createWrapper({ charts: [] });
-    expect(wrapper.find(CiCdAnalyticsAreaChart).exists()).toBe(false);
+    expect(wrapper.findComponent(CiCdAnalyticsAreaChart).exists()).toBe(false);
   });
 
   describe('slots', () => {
diff --git a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js
index 3c91b913e67..8fb59f38ee1 100644
--- a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js
+++ b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js
@@ -44,7 +44,7 @@ describe('~/projects/pipelines/charts/components/pipeline_charts.vue', () => {
 
   describe('overall statistics', () => {
     it('displays the statistics list', () => {
-      const list = wrapper.find(StatisticsList);
+      const list = wrapper.findComponent(StatisticsList);
 
       expect(list.exists()).toBe(true);
       expect(list.props('counts')).toEqual({
@@ -56,9 +56,9 @@ describe('~/projects/pipelines/charts/components/pipeline_charts.vue', () => {
     });
 
     it('displays the commit duration chart', () => {
-      const chart = wrapper.find(GlColumnChart);
+      const chart = wrapper.findComponent(GlColumnChart);
 
-      expect(chart.exists()).toBeTruthy();
+      expect(chart.exists()).toBe(true);
       expect(chart.props('yAxisTitle')).toBe('Minutes');
       expect(chart.props('xAxisTitle')).toBe('Commit');
       expect(chart.props('bars')).toBe(wrapper.vm.timesChartTransformedData);
@@ -68,12 +68,12 @@ describe('~/projects/pipelines/charts/components/pipeline_charts.vue', () => {
 
   describe('pipelines charts', () => {
     it('displays the charts components', () => {
-      expect(wrapper.find(CiCdAnalyticsCharts).exists()).toBe(true);
+      expect(wrapper.findComponent(CiCdAnalyticsCharts).exists()).toBe(true);
     });
 
     describe('displays individual correctly', () => {
       it('renders with the correct data', () => {
-        const charts = wrapper.find(CiCdAnalyticsCharts);
+        const charts = wrapper.findComponent(CiCdAnalyticsCharts);
         expect(charts.props()).toEqual({
           charts: wrapper.vm.areaCharts,
           chartOptions: wrapper.vm.$options.areaChartOptions,