Add latest changes from gitlab-org/gitlab@master

4 files changed, 40 insertions, 105 deletions

diff --git a/spec/frontend/fixtures/jobs.rb b/spec/frontend/fixtures/jobs.rb
index a825e1af268..376c04cd629 100644
--- a/spec/frontend/fixtures/jobs.rb
+++ b/spec/frontend/fixtures/jobs.rb
@@ -89,7 +89,9 @@ RSpec.describe 'Jobs (JavaScript fixtures)' do
       let(:variables) { { fullPath: 'frontend-fixtures/builds-project' } }
     end
 
-    it_behaves_like 'graphql queries', 'pages/admin/jobs/components/table/graphql/queries', 'get_all_jobs.query.graphql'
+    it_behaves_like 'graphql queries', 'pages/admin/jobs/components/table/graphql/queries', 'get_all_jobs.query.graphql' do
+      let(:user) { create(:admin) }
+    end
   end
 
   describe 'get_jobs_count.query.graphql', type: :request do
diff --git a/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js b/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js
index e7ac2576b6f..46d27528443 100644
--- a/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js
+++ b/spec/frontend/pages/admin/jobs/components/table/admin_job_table_app_spec.js
@@ -1,5 +1,5 @@
-import { GlSkeletonLoader, GlLoadingIcon } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
+import { GlSkeletonLoader, GlLoadingIcon, GlEmptyState } from '@gitlab/ui';
+import { mount, shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
@@ -8,7 +8,11 @@ import JobsTable from '~/jobs/components/table/jobs_table.vue';
 import getJobsQuery from '~/pages/admin/jobs/components/table/graphql/queries/get_all_jobs.query.graphql';
 import AdminJobsTableApp from '~/pages/admin/jobs/components/table/admin_jobs_table_app.vue';
 
-import { mockAllJobsResponsePaginated, statuses } from '../../../../../jobs/mock_data';
+import {
+  mockAllJobsResponsePaginated,
+  mockJobsResponseEmpty,
+  statuses,
+} from '../../../../../jobs/mock_data';
 
 Vue.use(VueApollo);
 
@@ -16,10 +20,12 @@ describe('Job table app', () => {
   let wrapper;
 
   const successHandler = jest.fn().mockResolvedValue(mockAllJobsResponsePaginated);
+  const emptyHandler = jest.fn().mockResolvedValue(mockJobsResponseEmpty);
 
   const findSkeletonLoader = () => wrapper.findComponent(GlSkeletonLoader);
   const findLoadingSpinner = () => wrapper.findComponent(GlLoadingIcon);
   const findTable = () => wrapper.findComponent(JobsTable);
+  const findEmptyState = () => wrapper.findComponent(GlEmptyState);
 
   const createMockApolloProvider = (handler) => {
     const requestHandlers = [[getJobsQuery, handler]];
@@ -58,4 +64,24 @@ describe('Job table app', () => {
       expect(findLoadingSpinner().exists()).toBe(false);
     });
   });
+
+  describe('empty state', () => {
+    it('should display empty state if there are no jobs and tab scope is null', async () => {
+      createComponent({ handler: emptyHandler, mountFn: mount });
+
+      await waitForPromises();
+
+      expect(findEmptyState().exists()).toBe(true);
+      expect(findTable().exists()).toBe(false);
+    });
+
+    it('should not display empty state if there are jobs and tab scope is not null', async () => {
+      createComponent({ handler: successHandler, mountFn: mount });
+
+      await waitForPromises();
+
+      expect(findEmptyState().exists()).toBe(false);
+      expect(findTable().exists()).toBe(true);
+    });
+  });
 });
diff --git a/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js b/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js
index 0f4a2b1d02f..4bf4257f462 100644
--- a/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js
+++ b/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js
@@ -1,24 +1,10 @@
 import '~/commons';
-import { GlButton, GlSprintf } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
-import { stubExperiments } from 'helpers/experimentation_helper';
-import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue';
-import ExperimentTracking from '~/experimentation/experiment_tracking';
 import PipelinesCiTemplates from '~/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue';
 import CiTemplates from '~/pipelines/components/pipelines_list/empty_state/ci_templates.vue';
-import {
-  RUNNERS_AVAILABILITY_SECTION_EXPERIMENT_NAME,
-  RUNNERS_SETTINGS_LINK_CLICKED_EVENT,
-  RUNNERS_DOCUMENTATION_LINK_CLICKED_EVENT,
-  RUNNERS_SETTINGS_BUTTON_CLICKED_EVENT,
-  I18N,
-} from '~/ci/pipeline_editor/constants';
 
 const pipelineEditorPath = '/-/ci/editor';
-const ciRunnerSettingsPath = '/-/settings/ci_cd';
-
-jest.mock('~/experimentation/experiment_tracking');
 
 describe('Pipelines CI Templates', () => {
   let wrapper;
@@ -28,8 +14,6 @@ describe('Pipelines CI Templates', () => {
     return shallowMountExtended(PipelinesCiTemplates, {
       provide: {
         pipelineEditorPath,
-        ciRunnerSettingsPath,
-        anyRunnersAvailable: true,
         ...propsData,
       },
       stubs,
@@ -38,19 +22,17 @@ describe('Pipelines CI Templates', () => {
 
   const findTestTemplateLink = () => wrapper.findByTestId('test-template-link');
   const findCiTemplates = () => wrapper.findComponent(CiTemplates);
-  const findSettingsLink = () => wrapper.findByTestId('settings-link');
-  const findDocumentationLink = () => wrapper.findByTestId('documentation-link');
-  const findSettingsButton = () => wrapper.findByTestId('settings-button');
 
-  describe('renders test template', () => {
+  describe('templates', () => {
     beforeEach(() => {
       wrapper = createWrapper();
     });
 
-    it('links to the getting started template', () => {
+    it('renders test template and Ci templates', () => {
       expect(findTestTemplateLink().attributes('href')).toBe(
         pipelineEditorPath.concat('?template=Getting-Started'),
       );
+      expect(findCiTemplates().exists()).toBe(true);
     });
   });
 
@@ -73,84 +55,4 @@ describe('Pipelines CI Templates', () => {
       });
     });
   });
-
-  describe('when the runners_availability_section experiment is active', () => {
-    beforeEach(() => {
-      stubExperiments({ runners_availability_section: 'candidate' });
-    });
-
-    describe('when runners are available', () => {
-      beforeEach(() => {
-        wrapper = createWrapper({ anyRunnersAvailable: true }, { GitlabExperiment, GlSprintf });
-      });
-
-      it('show the runners available section', () => {
-        expect(wrapper.text()).toContain(I18N.runners.title);
-      });
-
-      it('tracks an event when clicking the settings link', () => {
-        findSettingsLink().vm.$emit('click');
-
-        expect(ExperimentTracking).toHaveBeenCalledWith(
-          RUNNERS_AVAILABILITY_SECTION_EXPERIMENT_NAME,
-        );
-        expect(ExperimentTracking.prototype.event).toHaveBeenCalledWith(
-          RUNNERS_SETTINGS_LINK_CLICKED_EVENT,
-        );
-      });
-
-      it('tracks an event when clicking the documentation link', () => {
-        findDocumentationLink().vm.$emit('click');
-
-        expect(ExperimentTracking).toHaveBeenCalledWith(
-          RUNNERS_AVAILABILITY_SECTION_EXPERIMENT_NAME,
-        );
-        expect(ExperimentTracking.prototype.event).toHaveBeenCalledWith(
-          RUNNERS_DOCUMENTATION_LINK_CLICKED_EVENT,
-        );
-      });
-    });
-
-    describe('when runners are not available', () => {
-      beforeEach(() => {
-        wrapper = createWrapper({ anyRunnersAvailable: false }, { GitlabExperiment, GlButton });
-      });
-
-      it('show the no runners available section', () => {
-        expect(wrapper.text()).toContain(I18N.noRunners.title);
-      });
-
-      it('tracks an event when clicking the settings button', () => {
-        findSettingsButton().trigger('click');
-
-        expect(ExperimentTracking).toHaveBeenCalledWith(
-          RUNNERS_AVAILABILITY_SECTION_EXPERIMENT_NAME,
-        );
-        expect(ExperimentTracking.prototype.event).toHaveBeenCalledWith(
-          RUNNERS_SETTINGS_BUTTON_CLICKED_EVENT,
-        );
-      });
-    });
-  });
-
-  describe.each`
-    experimentVariant | anyRunnersAvailable | templatesRendered
-    ${'control'}      | ${true}             | ${true}
-    ${'control'}      | ${false}            | ${true}
-    ${'candidate'}    | ${true}             | ${true}
-    ${'candidate'}    | ${false}            | ${false}
-  `(
-    'when the runners_availability_section experiment variant is $experimentVariant and runners are available: $anyRunnersAvailable',
-    ({ experimentVariant, anyRunnersAvailable, templatesRendered }) => {
-      beforeEach(() => {
-        stubExperiments({ runners_availability_section: experimentVariant });
-        wrapper = createWrapper({ anyRunnersAvailable });
-      });
-
-      it(`renders the templates: ${templatesRendered}`, () => {
-        expect(findTestTemplateLink().exists()).toBe(templatesRendered);
-        expect(findCiTemplates().exists()).toBe(templatesRendered);
-      });
-    },
-  );
 });
diff --git a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
index 128da064ef7..07fc0be9e51 100644
--- a/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -113,6 +113,11 @@ const createComponent = (customConfig = {}, createState = true) => {
       GlSprintf,
     },
     apolloProvider: createMockApollo([[readyToMergeQuery, readyToMergeResponseSpy]]),
+    provide: {
+      glFeatures: {
+        autoMergeLabelsMrWidget: false,
+      },
+    },
   });
 };