Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 2 deletions

diff --git a/spec/frontend/vue_shared/components/web_ide_link_spec.js b/spec/frontend/vue_shared/components/web_ide_link_spec.js
index 1421ddf85f4..f5155347a15 100644
--- a/spec/frontend/vue_shared/components/web_ide_link_spec.js
+++ b/spec/frontend/vue_shared/components/web_ide_link_spec.js
@@ -442,7 +442,10 @@ describe('Web IDE link component', () => {
           {
             showEditButton: false,
           },
-          { glFeatures: { vscodeWebIde: true }, userCalloutDismisserSlotProps: { dismiss } },
+          {
+            glFeatures: { vscodeWebIde: true },
+            userCalloutDismisserSlotProps: { dismiss },
+          },
         );
       });
       it('does not skip the user_callout_dismisser query', () => {
@@ -514,12 +517,16 @@ describe('Web IDE link component', () => {
     `(
       'when vscode_web_ide=$featureFlag and showEditButton = $showEditButton',
       ({ vscodeWebIde, showEditButton }) => {
+        let dismiss;
+
         beforeEach(() => {
+          dismiss = jest.fn();
+
           createComponent(
             {
               showEditButton,
             },
-            { glFeatures: { vscodeWebIde } },
+            { glFeatures: { vscodeWebIde }, userCalloutDismisserSlotProps: { dismiss } },
           );
         });
 
@@ -534,6 +541,12 @@ describe('Web IDE link component', () => {
         it('mounts new web ide callout popover', () => {
           expect(findNewWebIdeCalloutPopover().exists()).toBe(false);
         });
+
+        it('does not dismiss the callout when action button is clicked', () => {
+          findActionsButton().vm.$emit('actionClicked');
+
+          expect(dismiss).not.toHaveBeenCalled();
+        });
       },
     );
   });