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

2 files changed, 3 insertions, 27 deletions

diff --git a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js
index 7775ed6aa37..1ea035c7184 100644
--- a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js
+++ b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_form_spec.js
@@ -71,12 +71,7 @@ describe('Sidebar Confidentiality Form', () => {
   it('creates a flash if mutation contains errors', async () => {
     createComponent({
       mutate: jest.fn().mockResolvedValue({
-        data: {
-          issuableSetConfidential: {
-            issuable: { confidential: false },
-            errors: ['Houston, we have a problem!'],
-          },
-        },
+        data: { issuableSetConfidential: { errors: ['Houston, we have a problem!'] } },
       }),
     });
     findConfidentialToggle().vm.$emit('click', new MouseEvent('click'));
@@ -87,24 +82,6 @@ describe('Sidebar Confidentiality Form', () => {
     });
   });
 
-  it('emits `closeForm` event with confidentiality value when mutation is successful', async () => {
-    createComponent({
-      mutate: jest.fn().mockResolvedValue({
-        data: {
-          issuableSetConfidential: {
-            issuable: { confidential: true },
-            errors: [],
-          },
-        },
-      }),
-    });
-
-    findConfidentialToggle().vm.$emit('click', new MouseEvent('click'));
-    await waitForPromises();
-
-    expect(wrapper.emitted('closeForm')).toEqual([[{ confidential: true }]]);
-  });
-
   describe('when issue is not confidential', () => {
     beforeEach(() => {
       createComponent();
diff --git a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_widget_spec.js b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_widget_spec.js
index 18ee423d12e..3a3f0b1d9fa 100644
--- a/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_widget_spec.js
+++ b/spec/frontend/sidebar/components/confidential/sidebar_confidentiality_widget_spec.js
@@ -132,7 +132,6 @@ describe('Sidebar Confidentiality Widget', () => {
   it('closes the form and dispatches an event when `closeForm` is emitted', async () => {
     createComponent();
     const el = wrapper.vm.$el;
-    const closeFormPayload = { confidential: true };
     jest.spyOn(el, 'dispatchEvent');
 
     await waitForPromises();
@@ -141,12 +140,12 @@ describe('Sidebar Confidentiality Widget', () => {
 
     expect(findConfidentialityForm().isVisible()).toBe(true);
 
-    findConfidentialityForm().vm.$emit('closeForm', closeFormPayload);
+    findConfidentialityForm().vm.$emit('closeForm');
     await nextTick();
     expect(findConfidentialityForm().isVisible()).toBe(false);
 
     expect(el.dispatchEvent).toHaveBeenCalled();
-    expect(wrapper.emitted('closeForm')).toEqual([[closeFormPayload]]);
+    expect(wrapper.emitted('closeForm')).toEqual([[]]);
   });
 
   it('emits `expandSidebar` event when it is emitted from child component', async () => {