Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 12 deletions

diff --git a/spec/frontend/notifications/components/custom_notifications_modal_spec.js b/spec/frontend/notifications/components/custom_notifications_modal_spec.js
index 5e4114d91f5..0782ec7cdd5 100644
--- a/spec/frontend/notifications/components/custom_notifications_modal_spec.js
+++ b/spec/frontend/notifications/components/custom_notifications_modal_spec.js
@@ -177,11 +177,8 @@ describe('CustomNotificationsModal', () => {
 
         await waitForPromises();
 
-        expect(
-          mockToastShow,
-        ).toHaveBeenCalledWith(
+        expect(mockToastShow).toHaveBeenCalledWith(
           'An error occurred while loading the notification settings. Please try again.',
-          { type: 'error' },
         );
       });
     });
@@ -255,11 +252,8 @@ describe('CustomNotificationsModal', () => {
 
         await waitForPromises();
 
-        expect(
-          mockToastShow,
-        ).toHaveBeenCalledWith(
+        expect(mockToastShow).toHaveBeenCalledWith(
           'An error occurred while updating the notification settings. Please try again.',
-          { type: 'error' },
         );
       });
     });
diff --git a/spec/frontend/notifications/components/notifications_dropdown_spec.js b/spec/frontend/notifications/components/notifications_dropdown_spec.js
index e90bd68d067..e12251ce6d9 100644
--- a/spec/frontend/notifications/components/notifications_dropdown_spec.js
+++ b/spec/frontend/notifications/components/notifications_dropdown_spec.js
@@ -242,11 +242,8 @@ describe('NotificationsDropdown', () => {
       await clickDropdownItemAt(1);
 
       expect(wrapper.vm.selectedNotificationLevel).toBe('global');
-      expect(
-        mockToastShow,
-      ).toHaveBeenCalledWith(
+      expect(mockToastShow).toHaveBeenCalledWith(
         'An error occurred while updating the notification settings. Please try again.',
-        { type: 'error' },
       );
     });