From 9ae5f328e42dff669c3276b379796583bcfb28cb Mon Sep 17 00:00:00 2001 From: Mo Mesgin Date: Wed, 25 Jun 2025 20:29:52 -0700 Subject: [PATCH 1/3] set cypress default viewport resolution --- cypress.config.ts | 2 ++ cypress/e2e/tests/components/yaml-editor.spec.ts | 1 - cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts | 1 - cypress/e2e/tests/pages/users-and-auth/roles.spec.ts | 1 - cypress/jenkins/cypress.config.jenkins.ts | 2 ++ 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cypress.config.ts b/cypress.config.ts index 936ba921e75..79961d17015 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -130,4 +130,6 @@ export default defineConfig({ }, videoCompression: 15, videoUploadOnPasses: false, + viewportWidth: 1280, + viewportHeight: 720, }); diff --git a/cypress/e2e/tests/components/yaml-editor.spec.ts b/cypress/e2e/tests/components/yaml-editor.spec.ts index 5c3bf13e8f9..6ce5f9453b5 100644 --- a/cypress/e2e/tests/components/yaml-editor.spec.ts +++ b/cypress/e2e/tests/components/yaml-editor.spec.ts @@ -11,7 +11,6 @@ describe('Yaml Editor', () => { beforeEach(() => { cy.login(); - cy.viewport(1280, 720); // Create a new deployment resource deploymentsCreatePage.goTo(); diff --git a/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts b/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts index 90248e0272b..0e8c4933e57 100644 --- a/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts +++ b/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts @@ -25,7 +25,6 @@ describe.skip('[Vue3 Skip]: Charts', { tags: ['@charts', '@adminUser'] }, () => before(() => { cy.login(); - cy.viewport(1280, 720); }); after(() => { diff --git a/cypress/e2e/tests/pages/users-and-auth/roles.spec.ts b/cypress/e2e/tests/pages/users-and-auth/roles.spec.ts index b09aaca4465..b7bc7f4f2ca 100644 --- a/cypress/e2e/tests/pages/users-and-auth/roles.spec.ts +++ b/cypress/e2e/tests/pages/users-and-auth/roles.spec.ts @@ -81,7 +81,6 @@ describe('Roles Templates', { tags: ['@usersAndAuths', '@adminUser'] }, () => { describe('Roles', () => { beforeEach(() => { cy.login(); - cy.viewport(1280, 720); }); it('can create a Global Role template', () => { diff --git a/cypress/jenkins/cypress.config.jenkins.ts b/cypress/jenkins/cypress.config.jenkins.ts index cf57b8fc139..e4f9225d713 100644 --- a/cypress/jenkins/cypress.config.jenkins.ts +++ b/cypress/jenkins/cypress.config.jenkins.ts @@ -122,4 +122,6 @@ export default defineConfig({ video: false, videoCompression: 25, videoUploadOnPasses: false, + viewportWidth: 1280, + viewportHeight: 720, }); From f3c4ef907a5c9e5f0cbc7570cd225e01123acc5a Mon Sep 17 00:00:00 2001 From: Mo Mesgin Date: Wed, 25 Jun 2025 20:35:25 -0700 Subject: [PATCH 2/3] lint --- cypress.config.ts | 4 ++-- cypress/jenkins/cypress.config.jenkins.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress.config.ts b/cypress.config.ts index 79961d17015..21430f33635 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -130,6 +130,6 @@ export default defineConfig({ }, videoCompression: 15, videoUploadOnPasses: false, - viewportWidth: 1280, - viewportHeight: 720, + viewportWidth: 1280, + viewportHeight: 720, }); diff --git a/cypress/jenkins/cypress.config.jenkins.ts b/cypress/jenkins/cypress.config.jenkins.ts index e4f9225d713..9a8b0118b47 100644 --- a/cypress/jenkins/cypress.config.jenkins.ts +++ b/cypress/jenkins/cypress.config.jenkins.ts @@ -122,6 +122,6 @@ export default defineConfig({ video: false, videoCompression: 25, videoUploadOnPasses: false, - viewportWidth: 1280, - viewportHeight: 720, + viewportWidth: 1280, + viewportHeight: 720, }); From 810dd120f49fddbe13201f26ae5c71caf9eab07b Mon Sep 17 00:00:00 2001 From: Mo Mesgin Date: Wed, 2 Jul 2025 06:34:07 -0700 Subject: [PATCH 3/3] remove changing viewport resolution for pods e2e test --- cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts b/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts index 1dce81bbcdd..8a0fe184d32 100644 --- a/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts +++ b/cypress/e2e/tests/pages/explorer2/workloads/pods.spec.ts @@ -424,7 +424,6 @@ describe('Pods', { testIsolation: 'off', tags: ['@explorer2', '@adminUser'] }, ( // testing https://github.com/rancher/dashboard/issues/14071 it('should remove the correct environment variable from the workload form', () => { - cy.viewport(1280, 720); const podDetails = new PodPo(); workloadsPodPage.goTo();