Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 4 deletions

diff --git a/spec/frontend/clusters/agents/components/show_spec.js b/spec/frontend/clusters/agents/components/show_spec.js
index c92bf634a92..f2f073544e3 100644
--- a/spec/frontend/clusters/agents/components/show_spec.js
+++ b/spec/frontend/clusters/agents/components/show_spec.js
@@ -137,7 +137,8 @@ describe('ClusterAgentShow', () => {
       await waitForPromises();
     });
 
-    it('displays agent create information with unknown user', () => {
+    it('displays agent create information with unknown user', async () => {
+      await waitForPromises();
       expect(findCreatedText()).toMatchInterpolatedText('Created by Unknown user 2 days ago');
     });
   });
@@ -153,19 +154,25 @@ describe('ClusterAgentShow', () => {
       await waitForPromises();
     });
 
-    it('displays token header with no count', () => {
+    it('displays token header with no count', async () => {
+      await waitForPromises();
       expect(findTokenCount()).toMatchInterpolatedText(`${ClusterAgentShow.i18n.tokens}`);
     });
   });
 
   describe('when the token list has additional pages', () => {
-    const pageInfo = {
+    const pageInfoResponse = {
       hasNextPage: true,
       hasPreviousPage: false,
       startCursor: 'prev',
       endCursor: 'next',
     };
 
+    const pageInfo = {
+      ...pageInfoResponse,
+      __typename: 'PageInfo',
+    };
+
     const tokenPagination = {
       ...defaultClusterAgent,
       tokens: {
@@ -184,7 +191,7 @@ describe('ClusterAgentShow', () => {
     });
 
     it('should pass pageInfo to the pagination component', () => {
-      expect(findPaginationButtons().props()).toMatchObject(pageInfo);
+      expect(findPaginationButtons().props()).toMatchObject(pageInfoResponse);
     });
   });