Skip to content

Commit cdced2f

Browse files
authored
fix: resolve flakiness by filling gaps in call to makeQuartzUseIDPEOrgID() (#5871)
1 parent 08d16c6 commit cdced2f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

cypress/e2e/cloud/globalHeader.test.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ describe('change-account change-org global header', () => {
2121

2222
cy.fixture('multiOrgIdentity').then(quartzIdentity => {
2323
quartzIdentity.org.id = idpeOrgID
24+
2425
cy.intercept('GET', 'api/v2/quartz/identity', quartzIdentity).as(
2526
'getQuartzIdentity'
2627
)
@@ -63,6 +64,7 @@ describe('change-account change-org global header', () => {
6364
method: 'GET',
6465
url: 'api/v2/orgs',
6566
}).then(res => {
67+
makeQuartzUseIDPEOrgID()
6668
// Store the IDPE org ID so that it can be cloned when intercepting quartz.
6769
if (res.body.orgs) {
6870
idpeOrgID = res.body.orgs[0].id
@@ -74,6 +76,7 @@ describe('change-account change-org global header', () => {
7476

7577
beforeEach(() => {
7678
// Preserve one session throughout.
79+
makeQuartzUseIDPEOrgID()
7780
Cypress.Cookies.preserveOnce('sid')
7881
cy.setFeatureFlags(globalHeaderFeatureFlags)
7982
})
@@ -133,8 +136,9 @@ describe('change-account change-org global header', () => {
133136
})
134137

135138
it('navigates to the org usage page', () => {
136-
cy.getByTestID('globalheader--org-dropdown').should('exist').click()
139+
makeQuartzUseIDPEOrgID()
137140

141+
cy.getByTestID('globalheader--org-dropdown').should('exist').click()
138142
cy.getByTestID('globalheader--org-dropdown-main').should('be.visible')
139143
cy.getByTestID('globalheader--org-dropdown-main-Usage')
140144
.should('be.visible')
@@ -178,6 +182,7 @@ describe('change-account change-org global header', () => {
178182
})
179183

180184
before(() => {
185+
makeQuartzUseIDPEOrgID()
181186
cy.visit('/')
182187
})
183188

0 commit comments

Comments
 (0)