Skip to content

Commit

Permalink
Bump cypress from 9.5.4 to 13.15.2 in /web
Browse files Browse the repository at this point in the history
Bumps [cypress](https://github.com/cypress-io/cypress) from 9.5.4 to 13.15.2.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](cypress-io/cypress@v9.5.4...v13.15.2)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and CRoberto1926 committed Nov 11, 2024
1 parent f3891e4 commit ef44b87
Show file tree
Hide file tree
Showing 17 changed files with 235 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
working-directory: web
run: |
../mvnw -B spring-boot:run -P history.plugin -f .. -pl :kadai-rest-spring-example-boot &> /dev/null &
npx wait-port -t 30000 localhost:8080 && yarn run e2e-standalone --spec "cypress/integration/monitor/**"
npx wait-port -t 30000 localhost:8080 && yarn run e2e-standalone --spec "cypress/e2e/monitor/**"
- name: Upload Cypress tests
if: failure()
uses: actions/upload-artifact@v4
Expand Down
33 changes: 33 additions & 0 deletions web/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { defineConfig } from 'cypress';

export default defineConfig({
retries: 2,
viewportWidth: 1280,
viewportHeight: 720,

env: {
appUrl: 'http://localhost:4200/#/kadai',
adminUrl: '/administration',
dropdownWait: 80,
testValueClassificationSelectionName: 'L10303',
testValueClassifications: 'CY-TEST-CLASSIFICATIONS',
testValueWorkbasketSelectionName: 'basxet0',
testValueWorkbaskets: 'CY-TEST-WORKBASKETS',
isLocal: true,
isHistoryEnabled: false
},

component: {
devServer: {
framework: 'angular',
bundler: 'webpack'
},
specPattern: '**/*.cy.ts'
},

e2e: {
setupNodeEvents(on, config) {
// implement node event listeners here
}
}
});
16 changes: 0 additions & 16 deletions web/cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions web/cypress/fixtures/example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "Using fixtures to represent data",
"email": "[email protected]",
"body": "Fixtures are a great way to mock data for responses to routes"
}
17 changes: 0 additions & 17 deletions web/cypress/plugins/index.js

This file was deleted.

37 changes: 37 additions & 0 deletions web/cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/// <reference types="cypress" />
// ***********************************************
// This example commands.ts shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add('login', (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
//
// declare global {
// namespace Cypress {
// interface Chainable {
// login(email: string, password: string): Chainable<void>
// drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
// dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
// visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
// }
// }
// }
12 changes: 12 additions & 0 deletions web/cypress/support/component-index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>Components App</title>
</head>
<body>
<div data-cy-root></div>
</body>
</html>
39 changes: 39 additions & 0 deletions web/cypress/support/component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// ***********************************************************
// This example support/component.ts is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************

// Import commands.js using ES2015 syntax:
import './commands';

// Alternatively you can use CommonJS syntax:
// require('./commands')

import { mount } from 'cypress/angular';

// Augment the Cypress namespace to include type definitions for
// your custom command.
// Alternatively, can be defined in cypress/support/component.d.ts
// with a <reference path="./component" /> at the top of your spec.
declare global {
namespace Cypress {
interface Chainable {
mount: typeof mount;
}
}
}

Cypress.Commands.add('mount', mount);

// Example use:
// cy.mount(MyComponent)
20 changes: 20 additions & 0 deletions web/cypress/support/e2e.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// ***********************************************************
// This example support/e2e.ts is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************

// Import commands.js using ES2015 syntax:
import './commands';

// Alternatively you can use CommonJS syntax:
// require('./commands')
38 changes: 0 additions & 38 deletions web/cypress/support/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"format:html": "prettier --write \"**/*.{html,}\"",
"e2e-dev": "cypress install && cypress run",
"e2e-dev:open": "cypress install && cypress open",
"e2e-standalone": "cypress install && cypress run --config-file cypress-standalone.json",
"e2e-standalone": "cypress install && cypress run --config-file cypress.config.ts",
"ci": "yarn install --frozen-lockfile"
},
"private": true,
Expand Down Expand Up @@ -65,7 +65,7 @@
"@typescript-eslint/eslint-plugin-tslint": "7.0.2",
"@typescript-eslint/parser": "8.13.0",
"compression-webpack-plugin": "11.1.0",
"cypress": "9.5.4",
"cypress": "13.15.2",
"cypress-intellij-reporter": "0.0.7",
"eslint": "9.14.0",
"eslint-config-prettier": "9.1.0",
Expand Down
Loading

0 comments on commit ef44b87

Please sign in to comment.