Skip to content

Commit ce3a01e

Browse files
dependabot[bot]dtrouillet
dependabot[bot]
and
dtrouillet
authored
build(deps-dev): bump cypress from 10.6.0 to 12.13.0 (#1556)
* build(deps-dev): bump cypress from 10.6.0 to 12.13.0 Bumps [cypress](https://github.com/cypress-io/cypress) from 10.6.0 to 12.13.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v10.6.0...v12.13.0) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat(cypress): replace server by intercept * feat(cypress): replace server by intercept --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Damien Trouillet <contact@damien-trouillet.fr>
1 parent 69ad339 commit ce3a01e

14 files changed

+95
-319
lines changed

‎cypress/e2e/ebad/explore-files.cy.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
context('Folders Management', () => {
22
before(function () {
3-
cy.server();
43
const currentDate = new Date();
54
const timestamp = currentDate.getTime();
65
this.normName = 'myNorme-'+timestamp;

‎cypress/e2e/ebad/manage-application.cy.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
context('Applications Administration', () => {
22
before(function () {
3-
cy.server();
43
const currentDate = new Date();
54
this.timestamp = currentDate.getTime();
65
this.app1Name = 'ApplicationTest1-'+this.timestamp;
76
this.app2Name = 'ApplicationTest2-'+this.timestamp;
8-
cy.route({
9-
method: 'GET',
10-
url: '/ebad/applications/gestion*',
11-
}).as('searchApplication');
7+
cy.intercept('GET', '/ebad/applications/gestion*').as('searchApplication');
128
});
139

1410
beforeEach(function () {
@@ -31,11 +27,7 @@ context('Applications Administration', () => {
3127
});
3228

3329
it('List applications', function () {
34-
cy.server();
35-
cy.route({
36-
method: 'GET',
37-
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+this.timestamp,
38-
}).as('searchApplicationTest');
30+
cy.intercept('GET','/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+this.timestamp).as('searchApplicationTest');
3931

4032
cy.login({login: this.login.admin.login, password: this.login.admin.password});
4133
cy.addApplication({codeAppli: 'AT1', name: this.app1Name, parmPattern: 'yyyyMMdd', filePattern: 'yyyyMMdd'});

‎cypress/e2e/ebad/manage-environnement.cy.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ context('Environment Management', () => {
66
this.identity1Name = 'Identity-'+timestamp;
77
this.app1Name = 'ApplicationTest1-'+timestamp;
88
this.app2Name = 'ApplicationTest2-'+timestamp;
9-
cy.server();
109
});
1110

1211
beforeEach(function () {
@@ -55,11 +54,7 @@ context('Environment Management', () => {
5554
});
5655

5756
it('List environments', function () {
58-
cy.server();
59-
cy.route({
60-
method: 'GET',
61-
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
62-
}).as('searchEnvironments');
57+
cy.intercept('GET', '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=').as('searchEnvironments');
6358

6459
cy.login({login: this.login.admin.login, password: this.login.admin.password})
6560
.addEnvironnement({applicationName: this.app1Name, name: 'ProductionCy', host: 'myhost.com', identity: this.identity1Name, homePath: '/home/batch', prefix: 'P', norme: this.norm1Name})
@@ -93,11 +88,7 @@ context('Environment Management', () => {
9388

9489

9590
it('Edit environment', function () {
96-
cy.server();
97-
cy.route({
98-
method: 'GET',
99-
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
100-
}).as('getEnvironments');
91+
cy.intercept('GET', '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=').as('getEnvironments');
10192

10293
cy.login({login: this.login.admin.login, password: this.login.admin.password})
10394
.addEnvironnement({applicationName: this.app1Name, name: 'Production', host: 'myhost.com', identity: this.identity1Name, homePath: '/home/batch', prefix: 'P', norme: this.norm1Name});

‎cypress/e2e/ebad/manage-identity-admin.cy.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ context('Identities Administration', () => {
77
this.identity3Name = 'TestCyWindows-' + timestamp;
88
this.identity4Name = 'TestUpCyLinux-' + timestamp;
99
this.identity5Name = 'TestUpCyLinuxNew-' + timestamp;
10-
cy.server();
1110
});
1211

1312
beforeEach(function () {
@@ -36,11 +35,7 @@ context('Identities Administration', () => {
3635
});
3736

3837
it('List identities', function () {
39-
cy.server();
40-
cy.route({
41-
method: 'GET',
42-
url: '/ebad/identities?page=0&size=*&sort=name,asc&name=TestCy',
43-
}).as('searchIdentitiesTest');
38+
cy.intercept('GET', '/ebad/identities?page=0&size=*&sort=name,asc&name=TestCy').as('searchIdentitiesTest');
4439

4540
cy.login({login: this.login.admin.login, password: this.login.admin.password})
4641
.addIdentityAdmin({
@@ -79,11 +74,7 @@ context('Identities Administration', () => {
7974
});
8075

8176
it('Edit identity', function () {
82-
cy.server();
83-
cy.route({
84-
method: 'GET',
85-
url: '/ebad/identities?page=0&size=*&sort=name,asc&name=' + this.identity5Name,
86-
}).as('searchIdentitiesTest');
77+
cy.intercept('GET', '/ebad/identities?page=0&size=*&sort=name,asc&name=' + this.identity5Name).as('searchIdentitiesTest');
8778

8879
cy.login({login: this.login.admin.login, password: this.login.admin.password})
8980
.addIdentityAdmin({

‎cypress/e2e/ebad/manage-identity-application.cy.js

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ context('Identities Management', () => {
88
this.identity4Name = 'TestUpCyLinux-' + timestamp;
99
this.identity5Name = 'TestUpCyLinuxNew-' + timestamp;
1010
this.app1Name = 'myApp-'+timestamp;
11-
cy.server();
1211
});
1312

1413
beforeEach(function () {
@@ -39,11 +38,7 @@ context('Identities Management', () => {
3938
});
4039

4140
it('List identities', function () {
42-
cy.server();
43-
cy.route({
44-
method: 'GET',
45-
url: '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name=TestCy',
46-
}).as('searchIdentitiesTest');
41+
cy.intercept('GET', '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name=TestCy').as('searchIdentitiesTest');
4742

4843
cy.login({login: this.login.admin.login, password: this.login.admin.password})
4944
.addIdentityManage({
@@ -67,10 +62,7 @@ context('Identities Management', () => {
6762
cy.get('#managementMenu').click();
6863
cy.get('#identityManageMenu').click();
6964

70-
cy.route({
71-
method: 'GET',
72-
url: '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name='
73-
}).as('selectApplication1');
65+
cy.intercept('GET', '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name=').as('selectApplication1');
7466
cy.get("#selectApplication").select(this.app1Name);
7567
cy.wait('@selectApplication1');
7668
cy.getSettled('input[type="search"]', { retries: 2, delay: 500 }).type('TestCy');
@@ -91,11 +83,7 @@ context('Identities Management', () => {
9183
});
9284

9385
it('Edit identity', function () {
94-
cy.server();
95-
cy.route({
96-
method: 'GET',
97-
url: '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name=' + this.identity5Name,
98-
}).as('searchIdentitiesTest');
86+
cy.intercept('GET', '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name=' + this.identity5Name).as('searchIdentitiesTest');
9987

10088
cy.login({login: this.login.admin.login, password: this.login.admin.password})
10189
.addIdentityManage({
@@ -134,10 +122,7 @@ context('Identities Management', () => {
134122
cy.get('#managementMenu').click();
135123
cy.get('#identityManageMenu').click();
136124

137-
cy.route({
138-
method: 'GET',
139-
url: '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name='
140-
}).as('selectApplication2');
125+
cy.intercept('GET', '/ebad/identities?applicationId=*&page=0&size=*&sort=name,asc&name=').as('selectApplication2');
141126
cy.get("#selectApplication").select(this.app1Name);
142127
cy.wait('@selectApplication2');
143128

‎cypress/e2e/ebad/manage-norme.cy.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ context('Norms Administration', () => {
77
this.norm3Name = 'TestCyWindows-'+timestamp;
88
this.norm4Name = 'TestUpCyLinux-'+timestamp;
99
this.norm5Name = 'TestUpCyLinuxNew-'+timestamp;
10-
cy.server();
1110
});
1211

1312
beforeEach(function () {
@@ -30,11 +29,7 @@ context('Norms Administration', () => {
3029
});
3130

3231
it('List norms', function () {
33-
cy.server();
34-
cy.route({
35-
method: 'GET',
36-
url: '/ebad/norms?page=0&size=*&sort=name,asc&name=TestCy',
37-
}).as('searchNormeTest');
32+
cy.intercept('GET', '/ebad/norms?page=0&size=*&sort=name,asc&name=TestCy').as('searchNormeTest');
3833

3934
cy.login({login: this.login.admin.login, password: this.login.admin.password})
4035
.addNorme({name: this.norm2Name, interpreteur: '/bin/bash', shellFolder: 'shell/', fileDate: 'date.txt'})
@@ -63,11 +58,7 @@ context('Norms Administration', () => {
6358
});
6459

6560
it('Edit norm', function () {
66-
cy.server();
67-
cy.route({
68-
method: 'GET',
69-
url: '/ebad/norms?page=0&size=*&sort=name,asc&name='+this.norm5Name,
70-
}).as('searchNormeTest');
61+
cy.intercept('GET', '/ebad/norms?page=0&size=*&sort=name,asc&name='+this.norm5Name).as('searchNormeTest');
7162

7263
cy.login({login: this.login.admin.login, password: this.login.admin.password})
7364
.addNorme({name: this.norm4Name, interpreteur: '/bin/bash', shellFolder: 'shell/', fileDate: 'date.in'});

‎cypress/support/application.commands.js

Lines changed: 12 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
/////////// APPLICATION ///////////////
22
Cypress.Commands.add("addApplication", ({codeAppli, name, parmPattern, filePattern}) => {
3-
cy.server();
4-
cy.route({
5-
method: 'PUT',
6-
url: '/ebad/applications/gestion',
7-
}).as('addApplication');
3+
cy.intercept('PUT', '/ebad/applications/gestion').as('addApplication');
84

95
cy.get('#administrationMenu').click();
106
cy.get('#applicationMenu').click();
@@ -19,15 +15,9 @@ Cypress.Commands.add("addApplication", ({codeAppli, name, parmPattern, filePatte
1915
});
2016

2117
Cypress.Commands.add("deleteApplication", ({codeAppli, name}) => {
22-
cy.server();
23-
cy.route({
24-
method: 'GET',
25-
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+name,
26-
}).as('searchApplication');
27-
cy.route({
28-
method: 'DELETE',
29-
url: '/ebad/applications/gestion*',
30-
}).as('deleteApplication');
18+
cy.intercept('GET', '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+name).as('searchApplication');
19+
cy.intercept('DELETE', '/ebad/applications/gestion*').as('deleteApplication');
20+
3121

3222
cy.get('#administrationMenu').click();
3323
cy.get('#applicationMenu').click();
@@ -43,15 +33,8 @@ Cypress.Commands.add("deleteApplication", ({codeAppli, name}) => {
4333
});
4434

4535
Cypress.Commands.add("updateApplication", ({codeAppliToUpdate, nameToUpdate, codeAppli, name, parmPattern, filePattern}) => {
46-
cy.server();
47-
cy.route({
48-
method: 'GET',
49-
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameToUpdate,
50-
}).as('searchApplication');
51-
cy.route({
52-
method: 'PATCH',
53-
url: '/ebad/applications/gestion',
54-
}).as('updateApplication');
36+
cy.intercept('GET', '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameToUpdate).as('searchApplication');
37+
cy.intercept('PATCH', '/ebad/applications/gestion').as('updateApplication');
5538

5639
cy.get('#administrationMenu').click();
5740
cy.get('#applicationMenu').click();
@@ -78,21 +61,9 @@ Cypress.Commands.add("updateApplication", ({codeAppliToUpdate, nameToUpdate, cod
7861
});
7962

8063
Cypress.Commands.add("addUserToApplication", ({codeAppli, nameAppli,firstname, login}) => {
81-
cy.server();
82-
cy.route({
83-
method: 'GET',
84-
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameAppli,
85-
}).as('searchApplication');
86-
87-
cy.route({
88-
method: 'GET',
89-
url: '/ebad/users?page=0&size=20&login='+firstname,
90-
}).as('searchUser');
91-
92-
cy.route({
93-
method: 'PATCH',
94-
url: '/ebad/users/application'
95-
}).as('userApplication');
64+
cy.intercept('GET', '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameAppli).as('searchApplication');
65+
cy.intercept('GET', '/ebad/users?page=0&size=20&login='+firstname).as('searchUser');
66+
cy.intercept('PATCH', '/ebad/users/application').as('userApplication');
9667

9768
cy.get('#administrationMenu').click();
9869
cy.get('#applicationMenu').click();
@@ -112,21 +83,9 @@ Cypress.Commands.add("addUserToApplication", ({codeAppli, nameAppli,firstname, l
11283
});
11384

11485
Cypress.Commands.add("addManagerToApplication", ({codeAppli, nameAppli, firstname, login}) => {
115-
cy.server();
116-
cy.route({
117-
method: 'GET',
118-
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameAppli,
119-
}).as('searchApplication');
120-
121-
cy.route({
122-
method: 'GET',
123-
url: '/ebad/users?page=0&size=*&login='+firstname,
124-
}).as('searchUser');
125-
126-
cy.route({
127-
method: 'PATCH',
128-
url: '/ebad/users/application'
129-
}).as('userApplication');
86+
cy.intercept('GET', '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameAppli).as('searchApplication');
87+
cy.intercept('GET', '/ebad/users?page=0&size=*&login='+firstname).as('searchUser');
88+
cy.intercept('PATCH', '/ebad/users/application').as('userApplication');
13089

13190
cy.get('#administrationMenu').click();
13291
cy.get('#applicationMenu').click();

‎cypress/support/environnement.commands.js

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
/////////// ENVIRONNEMENT ///////////////
22
Cypress.Commands.add("addEnvironnement", ({applicationName, name, host, identity, homePath, prefix, norme}) => {
3-
cy.server();
4-
cy.route({
5-
method: 'PUT',
6-
url: '/ebad/environments',
7-
}).as('addEnvironment');
3+
cy.intercept('PUT', '/ebad/environments').as('addEnvironment');
84

95
cy.get('#managementMenu').click();
106
cy.get('#environmentMenu').click();
@@ -21,22 +17,9 @@ Cypress.Commands.add("addEnvironnement", ({applicationName, name, host, identity
2117
});
2218

2319
Cypress.Commands.add("deleteEnvironnement", ({applicationName, environnementName}) => {
24-
cy.server();
25-
cy.route({
26-
method: 'GET',
27-
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
28-
}).as('getEnvironments');
29-
30-
cy.route({
31-
method: 'GET',
32-
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name='+environnementName,
33-
}).as('searchEnvironment');
34-
35-
cy.route({
36-
method: 'DELETE',
37-
url: '/ebad/environments?idEnv=**',
38-
}).as('deleteEnvironment');
39-
20+
cy.intercept('GET', '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=').as('getEnvironments');
21+
cy.intercept('GET', '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name='+environnementName).as('searchEnvironment');
22+
cy.intercept('DELETE', '/ebad/environments?idEnv=**').as('deleteEnvironment');
4023

4124
cy.get('#managementMenu').click();
4225
cy.get('#environmentMenu').click();
@@ -59,21 +42,9 @@ Cypress.Commands.add("deleteEnvironnement", ({applicationName, environnementName
5942
Cypress.Commands.add("updateEnvironnement", ({
6043
applicationName, environnementNameToUpdate, name, host, identity, homePath, prefix, norme
6144
}) => {
62-
cy.server();
63-
cy.route({
64-
method: 'GET',
65-
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
66-
}).as('getEnvironments');
67-
68-
cy.route({
69-
method: 'GET',
70-
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name='+environnementNameToUpdate,
71-
}).as('searchEnvironment');
72-
73-
cy.route({
74-
method: 'PATCH',
75-
url: '/ebad/environments',
76-
}).as('editEnvironment');
45+
cy.intercept('GET', '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=').as('getEnvironments');
46+
cy.intercept('GET', '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name='+environnementNameToUpdate).as('searchEnvironment');
47+
cy.intercept('PATCH', '/ebad/environments').as('editEnvironment');
7748

7849
cy.get('#managementMenu').click();
7950
cy.get('#environmentMenu').click();

0 commit comments

Comments
 (0)