Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

5 files changed, 50 insertions, 10 deletions

diff --git a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap b/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
index faa70982fac..d1cf9f2e248 100644
--- a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
+++ b/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
@@ -25,11 +25,12 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = `
     <div
       class="gl-mr-3 gl-ml-2"
     >
-      <span
-        class="badge badge-pill"
+      <gl-badge-stub
+        size="md"
+        variant="muted"
       >
-         4 
-      </span>
+        4
+      </gl-badge-stub>
     </div>
      
     <gl-icon-stub
diff --git a/spec/frontend/ide/components/preview/clientside_spec.js b/spec/frontend/ide/components/preview/clientside_spec.js
index 1768f01f3b8..b168eec0f16 100644
--- a/spec/frontend/ide/components/preview/clientside_spec.js
+++ b/spec/frontend/ide/components/preview/clientside_spec.js
@@ -73,6 +73,8 @@ describe('IDE clientside preview', () => {
 
   const createInitializedComponent = () => {
     createComponent();
+    // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+    // eslint-disable-next-line no-restricted-syntax
     wrapper.setData({
       sandpackReady: true,
       manager: {
@@ -202,6 +204,8 @@ describe('IDE clientside preview', () => {
 
       it('returns false if loading and mainEntry exists', () => {
         createComponent({ getters: { packageJson: dummyPackageJson } });
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({ loading: true });
 
         expect(wrapper.vm.showPreview).toBe(false);
@@ -209,6 +213,8 @@ describe('IDE clientside preview', () => {
 
       it('returns true if not loading and mainEntry exists', () => {
         createComponent({ getters: { packageJson: dummyPackageJson } });
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({ loading: false });
 
         expect(wrapper.vm.showPreview).toBe(true);
@@ -218,12 +224,16 @@ describe('IDE clientside preview', () => {
     describe('showEmptyState', () => {
       it('returns true if no mainEntry exists', () => {
         createComponent();
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({ loading: false });
         expect(wrapper.vm.showEmptyState).toBe(true);
       });
 
       it('returns false if loading', () => {
         createComponent();
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({ loading: true });
 
         expect(wrapper.vm.showEmptyState).toBe(false);
@@ -231,6 +241,8 @@ describe('IDE clientside preview', () => {
 
       it('returns false if not loading and mainEntry exists', () => {
         createComponent({ getters: { packageJson: dummyPackageJson } });
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({ loading: false });
 
         expect(wrapper.vm.showEmptyState).toBe(false);
@@ -307,6 +319,8 @@ describe('IDE clientside preview', () => {
     describe('update', () => {
       it('initializes manager if manager is empty', () => {
         createComponent({ getters: { packageJson: dummyPackageJson } });
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({ sandpackReady: true });
         wrapper.vm.update();
 
@@ -340,6 +354,8 @@ describe('IDE clientside preview', () => {
   describe('template', () => {
     it('renders ide-preview element when showPreview is true', () => {
       createComponent({ getters: { packageJson: dummyPackageJson } });
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({ loading: false });
 
       return wrapper.vm.$nextTick(() => {
@@ -349,6 +365,8 @@ describe('IDE clientside preview', () => {
 
     it('renders empty state', () => {
       createComponent();
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({ loading: false });
 
       return wrapper.vm.$nextTick(() => {
@@ -360,6 +378,8 @@ describe('IDE clientside preview', () => {
 
     it('renders loading icon', () => {
       createComponent();
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({ loading: true });
 
       return wrapper.vm.$nextTick(() => {
diff --git a/spec/frontend/ide/components/repo_editor_spec.js b/spec/frontend/ide/components/repo_editor_spec.js
index c957c64aa10..15af2d03704 100644
--- a/spec/frontend/ide/components/repo_editor_spec.js
+++ b/spec/frontend/ide/components/repo_editor_spec.js
@@ -5,7 +5,6 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import '~/behaviors/markdown/render_gfm';
 import waitForPromises from 'helpers/wait_for_promises';
-import waitUsingRealTimer from 'helpers/wait_using_real_timer';
 import { exampleConfigs, exampleFiles } from 'jest/ide/lib/editorconfig/mock_data';
 import { EDITOR_CODE_INSTANCE_FN, EDITOR_DIFF_INSTANCE_FN } from '~/editor/constants';
 import { EditorMarkdownExtension } from '~/editor/extensions/source_editor_markdown_ext';
@@ -540,7 +539,6 @@ describe('RepoEditor', () => {
         },
       });
       await vm.$nextTick();
-      await vm.$nextTick();
 
       expect(vm.initEditor).toHaveBeenCalled();
     });
@@ -567,8 +565,8 @@ describe('RepoEditor', () => {
         // switching from edit to diff mode usually triggers editor initialization
         vm.$store.state.viewer = viewerTypes.diff;
 
-        // we delay returning the file to make sure editor doesn't initialize before we fetch file content
-        await waitUsingRealTimer(30);
+        jest.runOnlyPendingTimers();
+
         return 'rawFileData123\n';
       });
 
@@ -598,8 +596,9 @@ describe('RepoEditor', () => {
           return aContent;
         })
         .mockImplementationOnce(async () => {
-          // we delay returning fileB content to make sure the editor doesn't initialize prematurely
-          await waitUsingRealTimer(30);
+          // we delay returning fileB content
+          // to make sure the editor doesn't initialize prematurely
+          jest.advanceTimersByTime(30);
           return bContent;
         });
 
diff --git a/spec/frontend/ide/components/terminal/terminal_spec.js b/spec/frontend/ide/components/terminal/terminal_spec.js
index c4b186c004a..afc49e22c83 100644
--- a/spec/frontend/ide/components/terminal/terminal_spec.js
+++ b/spec/frontend/ide/components/terminal/terminal_spec.js
@@ -128,6 +128,8 @@ describe('IDE Terminal', () => {
         canScrollDown: false,
       });
 
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({ canScrollUp: true, canScrollDown: true });
 
       return nextTick().then(() => {
diff --git a/spec/frontend/ide/stores/modules/pipelines/actions_spec.js b/spec/frontend/ide/stores/modules/pipelines/actions_spec.js
index 9aa31136c89..3ede37e2eed 100644
--- a/spec/frontend/ide/stores/modules/pipelines/actions_spec.js
+++ b/spec/frontend/ide/stores/modules/pipelines/actions_spec.js
@@ -188,6 +188,24 @@ describe('IDE pipelines actions', () => {
           .catch(done.fail);
       });
     });
+
+    it('sets latest pipeline to `null` and stops polling on empty project', (done) => {
+      mockedState = {
+        ...mockedState,
+        rootGetters: {
+          lastCommit: null,
+        },
+      };
+
+      testAction(
+        fetchLatestPipeline,
+        {},
+        mockedState,
+        [{ type: types.RECEIVE_LASTEST_PIPELINE_SUCCESS, payload: null }],
+        [{ type: 'stopPipelinePolling' }],
+        done,
+      );
+    });
   });
 
   describe('requestJobs', () => {