Merge branch 'develop' into update-v8-snapshot-cache-on-develop

cypress-io · Apr 19, 2023 · b66384c · b66384c · cypress-bot · Apr 19, 2023
2 parents 9bb1682 + 4963893
commit b66384c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -10,6 +10,7 @@ _Released 04/25/2023 (PENDING)_
 **Bugfixes:**
 
 - Fixed an issue where setting `videoCompression` to `0` would cause the video output to be broken. `0` is now treated as false. Addresses [#5191](https://github.com/cypress-io/cypress/issues/5191) and [#24595](https://github.com/cypress-io/cypress/issues/24595).
+- Fixed an issue on the [Debug page](https://on.cypress.io/debug-page) where the passing run status would appear even if the Cypress Cloud organization was over its monthly test result limit. Addresses [#26528](https://github.com/cypress-io/cypress/issues/26528).
 
 ## 12.10.0
 

diff --git a/packages/app/src/debug/DebugContainer.cy.tsx b/packages/app/src/debug/DebugContainer.cy.tsx
@@ -191,18 +191,28 @@ describe('<DebugContainer />', () => {
       it('handled usage exceeded', () => {
         mountTestRun('overLimit')
 
-        cy.findByRole('link', { name: 'Contact admin' }).should('have.attr', 'href', 'http://localhost:3000?utmMedium=Debug+Tab&utmSource=Binary%3A+Launchpad')
+        cy.findByRole('link', { name: 'Contact admin' }).should('be.visible').should('have.attr', 'href', 'http://localhost:3000?utmMedium=Debug+Tab&utmSource=Binary%3A+Launchpad')
 
         cy.percySnapshot()
       })
 
       it('handles retention exceeded', () => {
         mountTestRun('overLimitRetention')
 
-        cy.findByRole('link', { name: 'Contact admin' }).should('have.attr', 'href', 'http://localhost:3000?utmMedium=Debug+Tab&utmSource=Binary%3A+Launchpad')
+        cy.findByRole('link', { name: 'Contact admin' }).should('be.visible').should('have.attr', 'href', 'http://localhost:3000?utmMedium=Debug+Tab&utmSource=Binary%3A+Launchpad')
 
         cy.percySnapshot()
       })
+
+      it('does not show passing message if run is hidden', () => {
+        mountTestRun('overLimitPassed')
+
+        cy.contains('Well Done!').should('not.exist')
+
+        cy.contains('All your tests passed.').should('not.exist')
+
+        cy.findByRole('link', { name: 'Contact admin' }).should('be.visible').should('have.attr', 'href', 'http://localhost:3000?utmMedium=Debug+Tab&utmSource=Binary%3A+Launchpad')
+      })
     })
 
     context('cancelled', () => {

diff --git a/packages/app/src/debug/DebugPageDetails.vue b/packages/app/src/debug/DebugPageDetails.vue
@@ -22,7 +22,7 @@
     v-if="['PASSED', 'OVERLIMIT'].includes(status) || isHidden"
     class="flex flex-col flex-grow w-full p-12 justify-center items-center align-middle "
   >
-    <DebugPassed v-if="status === 'PASSED'" />
+    <DebugPassed v-if="status === 'PASSED' && !isHidden" />
     <DebugOverLimit
       v-if="isHidden"
       :over-limit-reasons="reasonsRunIsHidden"

diff --git a/packages/graphql/test/stubCloudTypes.ts b/packages/graphql/test/stubCloudTypes.ts
@@ -410,6 +410,7 @@ export const CloudRunStubs = {
   timedOutWithoutCi: createCloudRun({ status: 'TIMEDOUT', specs: skippedSpecs }),
   overLimit: createCloudRun({ status: 'OVERLIMIT', overLimitActionType: 'CONTACT_ADMIN', overLimitActionUrl: 'http://localhost:3000', isHidden: true, reasonsRunIsHidden: [{ __typename: 'UsageLimitExceeded', monthlyTests: 100 }] }),
   overLimitRetention: createCloudRun({ status: 'OVERLIMIT', overLimitActionType: 'CONTACT_ADMIN', overLimitActionUrl: 'http://localhost:3000', isHidden: true, reasonsRunIsHidden: [{ __typename: 'DataRetentionLimitExceeded', dataRetentionDays: 10 }] }),
+  overLimitPassed: createCloudRun({ status: 'PASSED', overLimitActionType: 'CONTACT_ADMIN', overLimitActionUrl: 'http://localhost:3000', isHidden: true, reasonsRunIsHidden: [{ __typename: 'UsageLimitExceeded', monthlyTests: 100 }] }),
   cancelled: createCloudRun({ status: 'CANCELLED', cancelledAt: '2019-01-25T02:00:00.000Z', specs: skippedSpecs, cancelledBy: { id: '123', fullName: 'Test Tester', email: 'adams@cypress.io', __typename: 'CloudUser', userIsViewer: true } }),
 } as Record<string, Required<CloudRun>>