Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

3 files changed, 14 insertions, 14 deletions

diff --git a/spec/frontend/ide/components/jobs/detail_spec.js b/spec/frontend/ide/components/jobs/detail_spec.js
index 79ac0a8122a..3634599f328 100644
--- a/spec/frontend/ide/components/jobs/detail_spec.js
+++ b/spec/frontend/ide/components/jobs/detail_spec.js
@@ -41,7 +41,7 @@ describe('IDE jobs detail view', () => {
     });
 
     it('scrolls to bottom', () => {
-      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalled();
+      expect(vm.$refs.buildJobLog.scrollTo).toHaveBeenCalled();
     });
 
     it('renders job output', () => {
@@ -125,15 +125,15 @@ describe('IDE jobs detail view', () => {
     beforeEach(() => {
       vm = vm.$mount();
 
-      jest.spyOn(vm.$refs.buildTrace, 'scrollTo').mockImplementation();
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollTo').mockImplementation();
     });
 
     it('scrolls build trace to bottom', () => {
-      jest.spyOn(vm.$refs.buildTrace, 'scrollHeight', 'get').mockReturnValue(1000);
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollHeight', 'get').mockReturnValue(1000);
 
       vm.scrollDown();
 
-      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalledWith(0, 1000);
+      expect(vm.$refs.buildJobLog.scrollTo).toHaveBeenCalledWith(0, 1000);
     });
   });
 
@@ -141,26 +141,26 @@ describe('IDE jobs detail view', () => {
     beforeEach(() => {
       vm = vm.$mount();
 
-      jest.spyOn(vm.$refs.buildTrace, 'scrollTo').mockImplementation();
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollTo').mockImplementation();
     });
 
     it('scrolls build trace to top', () => {
       vm.scrollUp();
 
-      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalledWith(0, 0);
+      expect(vm.$refs.buildJobLog.scrollTo).toHaveBeenCalledWith(0, 0);
     });
   });
 
   describe('scrollBuildLog', () => {
     beforeEach(() => {
       vm = vm.$mount();
-      jest.spyOn(vm.$refs.buildTrace, 'scrollTo').mockImplementation();
-      jest.spyOn(vm.$refs.buildTrace, 'offsetHeight', 'get').mockReturnValue(100);
-      jest.spyOn(vm.$refs.buildTrace, 'scrollHeight', 'get').mockReturnValue(200);
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollTo').mockImplementation();
+      jest.spyOn(vm.$refs.buildJobLog, 'offsetHeight', 'get').mockReturnValue(100);
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollHeight', 'get').mockReturnValue(200);
     });
 
     it('sets scrollPos to bottom when at the bottom', () => {
-      jest.spyOn(vm.$refs.buildTrace, 'scrollTop', 'get').mockReturnValue(100);
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollTop', 'get').mockReturnValue(100);
 
       vm.scrollBuildLog();
 
@@ -168,7 +168,7 @@ describe('IDE jobs detail view', () => {
     });
 
     it('sets scrollPos to top when at the top', () => {
-      jest.spyOn(vm.$refs.buildTrace, 'scrollTop', 'get').mockReturnValue(0);
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollTop', 'get').mockReturnValue(0);
       vm.scrollPos = 1;
 
       vm.scrollBuildLog();
@@ -177,7 +177,7 @@ describe('IDE jobs detail view', () => {
     });
 
     it('resets scrollPos when not at top or bottom', () => {
-      jest.spyOn(vm.$refs.buildTrace, 'scrollTop', 'get').mockReturnValue(10);
+      jest.spyOn(vm.$refs.buildJobLog, 'scrollTop', 'get').mockReturnValue(10);
 
       vm.scrollBuildLog();
 
diff --git a/spec/frontend/ide/stores/modules/commit/getters_spec.js b/spec/frontend/ide/stores/modules/commit/getters_spec.js
index 7a07ed05201..1e34087b290 100644
--- a/spec/frontend/ide/stores/modules/commit/getters_spec.js
+++ b/spec/frontend/ide/stores/modules/commit/getters_spec.js
@@ -126,7 +126,7 @@ describe('IDE commit module getters', () => {
         );
 
         expect(getters.preBuiltCommitMessage(state, null, rootState)).toBe(
-          'Update test-file, index.js files',
+          'Update test-file, index.js',
         );
       });
 
diff --git a/spec/frontend/ide/stores/utils_spec.js b/spec/frontend/ide/stores/utils_spec.js
index 79b6b66319e..a8875e0cd02 100644
--- a/spec/frontend/ide/stores/utils_spec.js
+++ b/spec/frontend/ide/stores/utils_spec.js
@@ -94,7 +94,7 @@ describe('Multi-file store utils', () => {
           {
             action: commitActionTypes.move,
             file_path: 'renamedFile',
-            content: null,
+            content: undefined,
             encoding: 'text',
             last_commit_id: undefined,
             previous_path: 'prevPath',