Fixed tests after merge

tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts

@@ -436,7 +436,7 @@ context('Content', () => {
         cy.umbracoTreeItem("content", [nodeName]).click();
 
         // Assert
-        cy.get('[data-element="node-info-status"]').find('.umb-badge').should('contain.text', "Draft");
+        cy.get('[data-element="node-info-status"]').find('.umb-badge').should('contain.text', "Unpublished");
 
         // Clean up (content is automatically deleted when document types are gone)
         cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);

tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/routing.ts

@@ -60,16 +60,16 @@ context('Routing', () => {
         // Ensure cleaned before tests run
         cy.deleteAllContent();
         cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
-        cy.umbracoEnsureLanguageNotExists(danishCulture);
-        cy.umbracoEnsureLanguageNotExists(swedishCulture);
+        cy.umbracoEnsureLanguageCultureNotExists(danishCulture);
+        cy.umbracoEnsureLanguageCultureNotExists(swedishCulture);
     });
 
     afterEach(() => {
         // Cleanup after tests
         cy.deleteAllContent();
         cy.umbracoEnsureDocumentTypeNameNotExists(rootDocTypeName);
-        cy.umbracoEnsureLanguageNotExists(danishCulture);
-        cy.umbracoEnsureLanguageNotExists(swedishCulture);
+        cy.umbracoEnsureLanguageCultureNotExists(danishCulture);
+        cy.umbracoEnsureLanguageCultureNotExists(swedishCulture);
     })
 
     it('Root node published in language A, Child node published in language A', () => {

tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js

@@ -23,6 +23,8 @@ context('Members', () => {
         //Type name
         cy.umbracoEditorHeaderName(name);
 
+        cy.get('[data-element="sub-view-umbMembership"]').click();
+        
         cy.get('input#_umb_login').clear().type(email);
         cy.get('input#_umb_email').clear().type(email);
         cy.get('input#password').clear().type(password, { timeout: passwordTimeout });

tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tours/backofficeTour.ts

@@ -81,20 +81,24 @@ function runBackOfficeIntroTour(percentageComplete, buttonText, timeout) {
     cy.get('.umb-tour-step__footer').should('be.visible');
     cy.get('.umb-tour-step__counter').should('be.visible');
 
-    for (let i = 1; i < 7; i++) {
-        cy.get('.umb-tour-step__counter').contains(i + '/12');
+    for (let i = 1; i < 8; i++) {
+        
+        if(i == 4) {
+            continue
+        }
+        cy.get('.umb-tour-step__counter').contains(i + '/13');
         cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();
     }
     cy.umbracoGlobalUser().click()
-    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('8/12');
+    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('9/13');
     cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();
-    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('9/12');
+    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('10/13');
     cy.get('.umb-overlay-drawer__align-right .umb-button').should('be.visible').click();
-    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('10/12');
+    cy.get('.umb-tour-step__counter', { timeout: timeout }).contains('11/13');
     cy.umbracoGlobalHelp().click()
 
-    for (let i = 11; i < 13; i++) {
-        cy.get('.umb-tour-step__counter', { timeout: timeout }).contains(i + '/12');
+    for (let i = 12; i <= 13; i++) {
+        cy.get('.umb-tour-step__counter', { timeout: timeout }).contains(i + '/13');
         cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();
     }
     cy.get('.umb-tour-step__footer .umb-button').should('be.visible').click();