Skip to content

Commit 64dc1d4

Browse files
Gets all of the remaining changes to Cypress tests from v9 dev - all tests pass on v8
1 parent a3797aa commit 64dc1d4

File tree

8 files changed

+20
-7
lines changed

8 files changed

+20
-7
lines changed

src/Umbraco.Tests.AcceptanceTest/cypress.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@
77
"password": "<insert password in cypress.env.json>"
88
},
99
"supportFile": "cypress/support/index.ts",
10-
"videoUploadOnPasses" : false
10+
"videoUploadOnPasses" : false,
11+
"retries": {
12+
"runMode": 5,
13+
"openMode": 1
14+
}
1115
}

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/documentTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ context('Document Types', () => {
3535
cy.get('#datatype-search').type('Textstring');
3636

3737
// Choose first item
38-
cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
38+
cy.get('ul.umb-card-grid [title="Textstring"]').closest("li").click();
3939

4040
// Save property
4141
cy.get('.btn-success').last().click();

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/mediaTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ context('Media Types', () => {
3434
cy.get('#datatype-search').type('Textstring');
3535

3636
// Choose first item
37-
cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
37+
cy.get('ul.umb-card-grid [title="Textstring"]').closest("li").click();
3838

3939
// Save property
4040
cy.get('.btn-success').last().click();

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/memberTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ context('Member Types', () => {
3232
cy.get('#datatype-search').type('Textstring');
3333

3434
// Choose first item
35-
cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
35+
cy.get('ul.umb-card-grid [title="Textstring"]').closest("li").click();
3636

3737
// Save property
3838
cy.get('.btn-success').last().click();

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ context('User Groups', () => {
1919

2020
// Assign sections
2121
cy.get('.umb-box:nth-child(1) .umb-property:nth-child(1) localize').click();
22-
cy.get('.umb-tree-item span').click({multiple:true});
22+
cy.get('.umb-tree-item__inner').click({multiple:true, timeout: 10000});
2323
cy.get('.btn-success').last().click();
2424

2525
// Save

src/Umbraco.Tests.AcceptanceTest/cypress/plugins/index.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
// This function is called when a project is opened or re-opened (e.g. due to
1313
// the project's config changing)
14+
const del = require('del')
1415

1516
/**
1617
* @type {Cypress.PluginConfig}
@@ -24,5 +25,13 @@ module.exports = (on, config) => {
2425
config.baseUrl = baseUrl;
2526
}
2627

28+
on('after:spec', (spec, results) => {
29+
if(results.stats.failures === 0 && results.video) {
30+
// `del()` returns a promise, so it's important to return it to ensure
31+
// deleting the video is finished before moving
32+
return del(results.video)
33+
}
34+
})
35+
2736
return config;
2837
}

src/Umbraco.Tests.AcceptanceTest/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
},
1010
"devDependencies": {
1111
"cross-env": "^7.0.2",
12-
"cypress": "8.4.1",
12+
"cypress": "^8.7.0",
1313
"del": "^6.0.0",
1414
"ncp": "^2.0.0",
1515
"prompt": "^1.2.0",
16-
"umbraco-cypress-testhelpers": "^1.0.0-beta-58"
16+
"umbraco-cypress-testhelpers": "^1.0.0-beta-60"
1717
},
1818
"dependencies": {
1919
"typescript": "^3.9.2"

0 commit comments

Comments
 (0)