Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
index 7e24aa439d4..fae93196d2c 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
@@ -57,12 +57,12 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
       </gl-button-stub>
        
       <gl-modal-stub
+        actioncancel="[object Object]"
+        actionprimary="[object Object]"
         arialabel=""
         dismisslabel="Close"
         modalclass=""
         modalid="resetWebhookModal"
-        ok-title="Reset webhook URL"
-        ok-variant="danger"
         size="md"
         title="Reset webhook URL"
         titletag="h4"
diff --git a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js
index d2b591d427d..521a861829b 100644
--- a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js
+++ b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js
@@ -47,7 +47,7 @@ describe('Alert integration settings form', () => {
       resetWebhookUrl.mockResolvedValueOnce({
         data: { pagerduty_webhook_url: newWebhookUrl },
       });
-      findModal().vm.$emit('ok');
+      findModal().vm.$emit('primary');
       await waitForPromises();
       expect(resetWebhookUrl).toHaveBeenCalled();
       expect(findWebhookInput().attributes('value')).toBe(newWebhookUrl);
@@ -56,7 +56,7 @@ describe('Alert integration settings form', () => {
 
     it('should show error message and NOT reset webhook url', async () => {
       resetWebhookUrl.mockRejectedValueOnce();
-      findModal().vm.$emit('ok');
+      findModal().vm.$emit('primary');
       await waitForPromises();
       expect(findAlert().attributes('variant')).toBe('danger');
     });