Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 9 deletions

diff --git a/spec/frontend/ci/runner/components/runner_status_badge_spec.js b/spec/frontend/ci/runner/components/runner_status_badge_spec.js
index 7d3064c2aef..45b410df2d4 100644
--- a/spec/frontend/ci/runner/components/runner_status_badge_spec.js
+++ b/spec/frontend/ci/runner/components/runner_status_badge_spec.js
@@ -37,12 +37,12 @@ describe('RunnerTypeBadge', () => {
   };
 
   beforeEach(() => {
-    jest.useFakeTimers('modern');
+    jest.useFakeTimers({ legacyFakeTimers: false });
     jest.setSystemTime(new Date('2021-01-01T00:00:00Z'));
   });
 
   afterEach(() => {
-    jest.useFakeTimers('legacy');
+    jest.useFakeTimers({ legacyFakeTimers: true });
 
     wrapper.destroy();
   });
diff --git a/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js b/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js
index c3493b3c9fd..1e5bb828dbf 100644
--- a/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js
+++ b/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js
@@ -448,13 +448,15 @@ describe('GroupRunnersApp', () => {
     it('navigates to the next page', async () => {
       await findRunnerPaginationNext().trigger('click');
 
-      expect(mockGroupRunnersHandler).toHaveBeenLastCalledWith({
-        groupFullPath: mockGroupFullPath,
-        membership: MEMBERSHIP_DESCENDANTS,
-        sort: CREATED_DESC,
-        first: RUNNER_PAGE_SIZE,
-        after: pageInfo.endCursor,
-      });
+      expect(mockGroupRunnersHandler).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          groupFullPath: mockGroupFullPath,
+          membership: MEMBERSHIP_DESCENDANTS,
+          sort: CREATED_DESC,
+          first: RUNNER_PAGE_SIZE,
+          after: pageInfo.endCursor,
+        }),
+      );
     });
   });