Skip to content

Commit b723b4d

Browse files
authored
Merge pull request #10045 from umbraco/v8/feature/update-cypress-and-fix-tests
Update cypress and fix tests
2 parents 3c9fb71 + f0b39ce commit b723b4d

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ context('Languages', () => {
66
});
77

88
it('Add language', () => {
9-
const name = "Kyrgyz (Kyrgyzstan)"; // Must be an option in the select box
9+
// For some reason the languages to chose fom seems to be translated differently than normal, as an example:
10+
// My system is set to EN (US), but most languages are translated into Danish for some reason
11+
// Aghem seems untranslated though?
12+
const name = "Aghem"; // Must be an option in the select box
1013

1114
cy.umbracoEnsureLanguageNameNotExists(name);
1215

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,18 @@ context('Templates', () => {
2323
cy.umbracoEnsureTemplateNameNotExists(name);
2424

2525
createTemplate();
26+
// We have to wait for the ace editor to load, because when the editor is loading it will "steal" the focus briefly,
27+
// which causes the save event to fire if we've added something to the header field, causing errors.
28+
cy.wait(500);
29+
2630
//Type name
2731
cy.umbracoEditorHeaderName(name);
2832
// Save
2933
// We must drop focus for the auto save event to occur.
3034
cy.get('.btn-success').focus();
3135
// And then wait for the auto save event to finish by finding the page in the tree view.
32-
// This is a bit of a roundabout way to find items in a treev view since we dont use umbracoTreeItem
33-
// but we must be able to wait for the save evnent to finish, and we can't do that with umbracoTreeItem
36+
// This is a bit of a roundabout way to find items in a tree view since we dont use umbracoTreeItem
37+
// but we must be able to wait for the save event to finish, and we can't do that with umbracoTreeItem
3438
cy.get('[data-element="tree-item-templates"] > :nth-child(2) > .umb-animated > .umb-tree-item__inner > .umb-tree-item__label')
3539
.contains(name).should('be.visible', { timeout: 10000 });
3640
// Now that the auto save event has finished we can save

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function resetTourData() {
4949
{
5050
"alias": "umbIntroIntroduction",
5151
"completed": false,
52-
"disabled": false
52+
"disabled": true
5353
};
5454

5555
cy.getCookie('UMB-XSRF-TOKEN', { log: false }).then((token) => {

src/Umbraco.Tests.AcceptanceTest/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"devDependencies": {
99
"cross-env": "^7.0.2",
10-
"cypress": "^6.0.1",
10+
"cypress": "^6.8.0",
1111
"ncp": "^2.0.0",
1212
"prompt": "^1.0.0",
1313
"umbraco-cypress-testhelpers": "^1.0.0-beta-52"

0 commit comments

Comments
 (0)