fix: fix flaky about test (#5872)

Author: wdoconnell

cypress/e2e/shared/about.test.ts

@@ -1,28 +1,41 @@
 import {Organization} from '../../../src/types'
 
 describe('About Page', () => {
+  const apiOrgPath =
+    Cypress.env('dexUrl') === 'OSS' ? '/api/v2/orgs/*' : '/api/v2/quartz/orgs/*'
+  const CLOUD = Cypress.env('dexUrl') === 'OSS' ? false : true
+
   beforeEach(() => {
     cy.flush()
     cy.signin()
 
+    cy.intercept('GET', apiOrgPath).as('getOrg')
+    cy.intercept('GET', `${apiOrgPath}/users`).as('getOrgUsers')
+    cy.intercept('GET', `${apiOrgPath}/invites`).as('getOrgInvites')
+    cy.intercept('PATCH', apiOrgPath).as('patchOrg')
     cy.get('@org').then((org: Organization) => {
       cy.visit(`/orgs/${org.id}/org-settings`)
       cy.getByTestID('about-page--header').should('be.visible')
     })
   })
 
   it('should display everything correctly', () => {
-    cy.getByTestID('common-ids--panel').within(() => {
-      cy.getByTestID('code-snippet--userid').should('exist')
-      cy.getByTestID('copy-btn--userid').should('not.be.disabled')
+    if (CLOUD) {
+      cy.wait('@getOrg')
+      cy.wait('@getOrgUsers')
+      cy.wait('@getOrgInvites')
+    }
+    cy.getByTestID('code-snippet--userid').should('be.visible')
+    cy.getByTestID('copy-btn--userid').should('not.be.disabled')
 
-      cy.getByTestID('code-snippet--orgid').should('exist')
-      cy.getByTestID('copy-btn--orgid').should('not.be.disabled')
-    })
+    cy.getByTestID('code-snippet--orgid').should('be.visible')
+    cy.getByTestID('copy-btn--orgid').should('not.be.disabled')
 
-    cy.getByTestID('organization-profile--panel').within(() => {
-      cy.getByTestID('rename-org--button').click()
-    })
+    if (CLOUD) {
+      cy.getByTestID('org-profile--panel').contains('Cloud Provider')
+    }
+
+    cy.getByTestID('rename-org--button').should('be.visible').click()
 
     cy.getByTestID('danger-confirmation--button').click()
     cy.getByTestID('form--element-error').should('not.exist')
@@ -41,10 +54,6 @@ describe('About Page', () => {
 
     const newOrgName = `hard@knock.life${Math.random()}`
 
-    const patchOrgPath =
-      Cypress.env('dexUrl') === 'OSS' ? 'api/v2/orgs/*' : 'api/v2/quartz/orgs/*'
-
-    cy.intercept('PATCH', patchOrgPath).as('patchOrg')
     cy.getByTestID('create-org-name-input').type(newOrgName)
     cy.getByTestID('rename-org-submit--button')
       .should('not.be.disabled')