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

4 files changed, 8 insertions, 8 deletions

diff --git a/spec/frontend/editor/components/source_editor_toolbar_spec.js b/spec/frontend/editor/components/source_editor_toolbar_spec.js
index 6e99eadbd97..bead39ca744 100644
--- a/spec/frontend/editor/components/source_editor_toolbar_spec.js
+++ b/spec/frontend/editor/components/source_editor_toolbar_spec.js
@@ -68,7 +68,7 @@ describe('Source Editor Toolbar', () => {
   });
 
   describe('buttons update', () => {
-    it('it properly updates buttons on Apollo cache update', async () => {
+    it('properly updates buttons on Apollo cache update', async () => {
       const item = buildButton('first', {
         group: EDITOR_TOOLBAR_RIGHT_GROUP,
       });
diff --git a/spec/frontend/editor/source_editor_extension_spec.js b/spec/frontend/editor/source_editor_extension_spec.js
index 78453aaa491..3424e71d326 100644
--- a/spec/frontend/editor/source_editor_extension_spec.js
+++ b/spec/frontend/editor/source_editor_extension_spec.js
@@ -16,7 +16,7 @@ describe('Editor Extension', () => {
     'throws when definition = $definition and setupOptions = $setupOptions',
     ({ definition, setupOptions }) => {
       const constructExtension = () => new EditorExtension({ definition, setupOptions });
-      expect(constructExtension).toThrowError(EDITOR_EXTENSION_DEFINITION_ERROR);
+      expect(constructExtension).toThrow(EDITOR_EXTENSION_DEFINITION_ERROR);
     },
   );
 
diff --git a/spec/frontend/editor/source_editor_instance_spec.js b/spec/frontend/editor/source_editor_instance_spec.js
index 1223fee320e..20ba23d56ff 100644
--- a/spec/frontend/editor/source_editor_instance_spec.js
+++ b/spec/frontend/editor/source_editor_instance_spec.js
@@ -248,7 +248,7 @@ describe('Source Editor Instance', () => {
           const useExtension = () => {
             seInstance.use(extensions);
           };
-          expect(useExtension).toThrowError(thrownError);
+          expect(useExtension).toThrow(thrownError);
         },
       );
 
@@ -336,7 +336,7 @@ describe('Source Editor Instance', () => {
           const unuse = () => {
             seInstance.unuse(unuseExtension);
           };
-          expect(unuse).toThrowError(thrownError);
+          expect(unuse).toThrow(thrownError);
         },
       );
 
@@ -382,7 +382,7 @@ describe('Source Editor Instance', () => {
         },
       );
 
-      it('it does not remove entry from the global registry to keep for potential future re-use', () => {
+      it('does not remove entry from the global registry to keep for potential future re-use', () => {
         const extensionStore = new Map();
         seInstance = new SourceEditorInstance({}, extensionStore);
         const extensions = seInstance.use(fullExtensionsArray);
diff --git a/spec/frontend/editor/source_editor_webide_ext_spec.js b/spec/frontend/editor/source_editor_webide_ext_spec.js
index 096b6b1646f..f418eab668a 100644
--- a/spec/frontend/editor/source_editor_webide_ext_spec.js
+++ b/spec/frontend/editor/source_editor_webide_ext_spec.js
@@ -30,7 +30,7 @@ describe('Source Editor Web IDE Extension', () => {
         const sideBySideSpy = jest.spyOn(instance, 'updateOptions');
         instance.use({ definition: EditorWebIdeExtension });
 
-        expect(sideBySideSpy).toBeCalledWith({ renderSideBySide });
+        expect(sideBySideSpy).toHaveBeenCalledWith({ renderSideBySide });
       },
     );
 
@@ -45,11 +45,11 @@ describe('Source Editor Web IDE Extension', () => {
       const sideBySideSpy = jest.spyOn(instance, 'updateOptions');
       await emitter.fire();
 
-      expect(sideBySideSpy).toBeCalledWith({ renderSideBySide: true });
+      expect(sideBySideSpy).toHaveBeenCalledWith({ renderSideBySide: true });
 
       editorEl.style.width = '0px';
       await emitter.fire();
-      expect(sideBySideSpy).toBeCalledWith({ renderSideBySide: false });
+      expect(sideBySideSpy).toHaveBeenCalledWith({ renderSideBySide: false });
     });
   });
 });