Skip to content

Commit

Permalink
mgr/dashboard: upgrade to cypress 12
Browse files Browse the repository at this point in the history
Looks like chrome 117 will need cypress >=12.15.0
cypress-io/cypress-documentation#5479

Fixes: https://tracker.ceph.com/issues/62971
Signed-off-by: Nizamudeen A <nia@redhat.com>
  • Loading branch information
nizamial09 committed Sep 25, 2023
1 parent 3016a4d commit 2b66f02
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 19 deletions.
34 changes: 17 additions & 17 deletions src/pybind/mgr/dashboard/frontend/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from "cypress";
import { defineConfig } from 'cypress';

export default defineConfig({
video: true,
Expand All @@ -7,22 +7,22 @@ export default defineConfig({
responseTimeout: 45000,
viewportHeight: 1080,
viewportWidth: 1920,
projectId: "k7ab29",
reporter: "cypress-multi-reporters",
projectId: 'k7ab29',
reporter: 'cypress-multi-reporters',

reporterOptions: {
reporterEnabled: "spec, mocha-junit-reporter",
reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: {
mochaFile: "cypress/reports/results-[hash].xml",
},
mochaFile: 'cypress/reports/results-[hash].xml'
}
},

retries: 1,

env: {
LOGIN_USER: "admin",
LOGIN_PWD: "admin",
CEPH2_URL: "https://localhost:4202/",
LOGIN_USER: 'admin',
LOGIN_PWD: 'admin',
CEPH2_URL: 'https://localhost:4202/'
},

chromeWebSecurity: false,
Expand All @@ -37,19 +37,19 @@ export default defineConfig({
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require("./cypress/plugins/index.js")(on, config);
return require('./cypress/plugins/index.js')(on, config);
},
baseUrl: "https://localhost:4200/",
excludeSpecPattern: ["*.po.ts", "**/orchestrator/**"],
baseUrl: 'https://localhost:4200/',
excludeSpecPattern: ['*.po.ts', '**/orchestrator/**'],
experimentalSessionAndOrigin: true,
specPattern: "cypress/e2e/**/*-spec.{js,jsx,ts,tsx,feature}",
specPattern: 'cypress/e2e/**/*-spec.{js,jsx,ts,tsx,feature}'
},

component: {
devServer: {
framework: "angular",
bundler: "webpack",
framework: 'angular',
bundler: 'webpack'
},
specPattern: "**/*.cy.ts",
},
specPattern: '**/*.cy.ts'
}
});
10 changes: 8 additions & 2 deletions src/pybind/mgr/dashboard/frontend/cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,14 @@ function requestAuth(username: string, password: string, url = '') {
}

// @ts-ignore
Cypress.Commands.add('text', { prevSubject: true }, (subject: any) => {
return subject.text();
Cypress.Commands.add('text', { prevSubject: true }, ($element: JQuery<HTMLElement>) => {
cy.wrap($element).scrollIntoView();
return cy
.wrap($element)
.invoke('text')
.then((text: string) => {
return text.toString();
});
});

Cypress.Commands.add('logToConsole', (message: string, optional?: any) => {
Expand Down

0 comments on commit 2b66f02

Please sign in to comment.