diff --git a/cypress/e2e/cloud/userAccounts.test.ts b/cypress/e2e/cloud/userAccounts.test.ts index f58002c4eb..46e4244a50 100644 --- a/cypress/e2e/cloud/userAccounts.test.ts +++ b/cypress/e2e/cloud/userAccounts.test.ts @@ -1,4 +1,3 @@ -import {Organization} from '../../../src/types' import {makeQuartzUseIDPEOrgID} from 'cypress/support/Utils' // This variable stores the current IDPE orgid and syncs it with the quartz-mock orgid. @@ -59,12 +58,17 @@ const setupTest = (setupParams: SetupParams) => { ) } -const doSetup = cy => { +const doSetup = () => { cy.flush().then(() => { cy.signin().then(() => { - cy.get('@org').then(({id}: Organization) => { + // Fetch org directly to avoid race condition with @org alias + cy.request({ + method: 'GET', + url: 'api/v2/orgs', + }).then(res => { + const orgId = res.body.orgs?.[0]?.id cy.intercept('GET', 'api/v2/quartz/orgs/**/users').as('getOrgsUsers') - cy.visit(`/orgs/${id}/accounts/settings`) + cy.visit(`/orgs/${orgId}/accounts/settings`) cy.wait('@getOrgsUsers') }) }) @@ -85,7 +89,7 @@ describe('Account Page tests', () => { {id: 415, isActive: false, isDefault: true, name: 'Veganomicon'}, ], }) - doSetup(cy) + doSetup() }) it('can get to the account page and rename the active account', () => { @@ -169,7 +173,7 @@ describe('Free account Deletion', () => { .click() }) cy.location().should(loc => { - expect(loc.href).to.eq(`https://www.influxdata.com/mkt-cancel/`) + expect(loc.href).to.include('https://www.influxdata.com/mkt-cancel') }) }) } diff --git a/docker/Dockerfile.cypress b/docker/Dockerfile.cypress index 40d8739d3b..37358768d6 100644 --- a/docker/Dockerfile.cypress +++ b/docker/Dockerfile.cypress @@ -7,7 +7,8 @@ WORKDIR /repo COPY ./package.json . -RUN yarn add cypress-circleci-reporter +# Pin to 0.3.0 pending update to cypress-slim image. +RUN yarn add cypress-circleci-reporter@0.3.0 COPY ./cypress.json ./cypress.json COPY ./cypress ./cypress diff --git a/package.json b/package.json index db18cea613..1c7d04dad2 100644 --- a/package.json +++ b/package.json @@ -183,7 +183,7 @@ "intersection-observer": "^0.12.2", "jsonlint-mod": "^1.7.5", "jsonpath": "^1.1.1", - "jspdf": "3.0.2", + "jspdf": "4.0.0", "lodash": "^4.17.21", "luxon": "^3.2.1", "memoize-one": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index f125196747..21547cb0a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1305,10 +1305,10 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/runtime@^7.26.9": - version "7.28.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.3.tgz#75c5034b55ba868121668be5d5bb31cc64e6e61a" - integrity sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA== +"@babel/runtime@^7.28.4": + version "7.28.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326" + integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ== "@babel/runtime@^7.3.1": version "7.17.9" @@ -1535,10 +1535,10 @@ resolved "https://registry.yarnpkg.com/@influxdata/influxdb-templates/-/influxdb-templates-0.12.0.tgz#03fa1787ba2235c99da72421594a45bdf6449c68" integrity sha512-HVfQeuuX5reJDRwjPRXX9ztOL654gKeZys+RC1pk+CU3g3MbCTzpgGMEoBDVYkPEhppopuHfB8mHndG6gh2xSw== -"@influxdata/oats@0.5.3": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@influxdata/oats/-/oats-0.5.3.tgz#eacedf71c802396d981fac447274a5cc34f5d932" - integrity sha512-OG3kr6p5U+wpa2qny+Cu8CBqHJne9mKEC5ux4JJTnk1eQnfAtNv+DGdz0QH+Ouz/8cqjl2erkPx6RPMGmUYMeA== +"@influxdata/oats@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@influxdata/oats/-/oats-0.7.0.tgz#dd3d94a7b8d42a5d8dbedf4e2ccdb097dd9563f4" + integrity sha512-i78Y0svY0H9nYo1YZ0KzTV4KO6mj+jItTJcUgZq8/y6TJlexE3wma9qpG2lxzwj1LGBSogTjfUWVYdRUm2m05Q== dependencies: commander "^2.20.0" humps "^2.0.1" @@ -7246,12 +7246,12 @@ jsonpath@^1.1.1: static-eval "2.0.2" underscore "1.12.1" -jspdf@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-3.0.2.tgz#f1e0e7f0954327bea4b8b02008613ad51e6024f6" - integrity sha512-G0fQDJ5fAm6UW78HG6lNXyq09l0PrA1rpNY5i+ly17Zb1fMMFSmS+3lw4cnrAPGyouv2Y0ylujbY2Ieq3DSlKA== +jspdf@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-4.0.0.tgz#3731c0a1a7d8afe28c681891236f8ad4a662d893" + integrity sha512-w12U97Z6edKd2tXDn3LzTLg7C7QLJlx0BPfM3ecjK2BckUl9/81vZ+r5gK4/3KQdhAcEZhENUxRhtgYBj75MqQ== dependencies: - "@babel/runtime" "^7.26.9" + "@babel/runtime" "^7.28.4" fast-png "^6.2.0" fflate "^0.8.1" optionalDependencies: