Merge remote-tracking branch 'origin/v8/dev' into v8/feature/version-history-cleanup

# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

Author: bergmania

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -395,6 +395,27 @@ public bool UseHttps
             }
         }
 
+        /// <summary>
+        /// Returns true if TinyMCE scripting sanitization should be applied
+        /// </summary>
+        /// <remarks>
+        /// The default value is false
+        /// </remarks>
+        public bool SanitizeTinyMce
+        {
+            get
+            {
+                try
+                {
+                    return bool.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.SanitizeTinyMce]);
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
         /// <summary>
         /// An int value representing the time in milliseconds to lock the database for a write operation
         /// </summary>

src/Umbraco.Core/Configuration/IGlobalSettings.cs

@@ -77,5 +77,10 @@ public interface IGlobalSettings
         /// Gets the write lock timeout.
         /// </summary>
         int SqlWriteLockTimeOut { get; }
+
+        /// <summary>
+        /// Returns true if TinyMCE scripting sanitization should be applied
+        /// </summary>
+        bool SanitizeTinyMce { get; }
     }
 }

src/Umbraco.Core/Constants-AppSettings.cs

@@ -109,7 +109,7 @@ public static class AppSettings
             /// A true or false indicating whether umbraco should force a secure (https) connection to the backoffice.
             /// </summary>
             public const string UseHttps = "Umbraco.Core.UseHttps";
-            
+
             /// <summary>
             /// A true/false value indicating whether the content dashboard should be visible for all user groups.
             /// </summary>
@@ -155,6 +155,11 @@ public static class Debug
             /// An int value representing the time in milliseconds to lock the database for a write operation
             /// </summary>
             public const string SqlWriteLockTimeOut = "Umbraco.Core.SqlWriteLockTimeOut";
+
+            /// <summary>
+            /// Returns true if TinyMCE scripting sanitization should be applied
+            /// </summary>
+            public const string SanitizeTinyMce = "Umbraco.Web.SanitizeTinyMce";
         }
     }
 }

src/Umbraco.Tests.AcceptanceTest/cypress.json

@@ -7,5 +7,9 @@
         "password": "<insert password in cypress.env.json>"
     },
     "supportFile": "cypress/support/index.ts",
-    "videoUploadOnPasses" : false
+    "videoUploadOnPasses" : false,
+    "retries": {
+      "runMode": 5,
+      "openMode": 1
+    }
 }

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

@@ -766,7 +766,8 @@ context('Content', () => {
         // Click macro
         cy.get(':nth-child(4) > .umb-card-grid-item > :nth-child(1)').click();
         // Select the macro
-        cy.get('.umb-card-grid-item').contains(macroName).click();
+        cy.get(`.umb-card-grid-item[title='${macroName}']`).click('bottom');
+
 
         // Save and publish
         cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();

src/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts

@@ -2,6 +2,7 @@
 import {
     AliasHelper,
     ApprovedColorPickerDataTypeBuilder,
+    TextBoxDataTypeBuilder,
 } from 'umbraco-cypress-testhelpers';
 
 context('DataTypes', () => {
@@ -62,6 +63,48 @@ context('DataTypes', () => {
         cy.umbracoEnsureTemplateNameNotExists(name);
     });
 
+    it('Tests Textbox Maxlength', () => {
+        cy.deleteAllContent();
+        const name = 'Textbox Maxlength Test';
+        const alias = AliasHelper.toAlias(name);
+
+        cy.umbracoEnsureDocumentTypeNameNotExists(name);
+        cy.umbracoEnsureDataTypeNameNotExists(name);
+
+        const textBoxDataType = new TextBoxDataTypeBuilder()
+            .withName(name)
+            .withMaxChars(10)
+            .build()
+
+        cy.umbracoCreateDocTypeWithContent(name, alias, textBoxDataType);
+
+        // Act
+        // Enter content
+        // Assert no helptext with (max-2) chars & can save
+        cy.umbracoRefreshContentTree();
+        cy.umbracoTreeItem("content", [name]).click();
+        cy.get('input[name="textbox"]').type('12345678');
+        cy.get('localize[key="textbox_characters_left"]').should('not.exist');
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.umbracoSuccessNotification().should('be.visible');
+        cy.get('.property-error').should('not.be.visible');
+
+        // Add char and assert helptext appears - no publish to save time & has been asserted above & below
+        cy.get('input[name="textbox"]').type('9');
+        cy.get('localize[key="textbox_characters_left"]').contains('characters left').should('exist');
+        cy.get('.property-error').should('not.be.visible');
+
+        // Add char and assert errortext appears and can't save
+        cy.get('input[name="textbox"]').type('10'); // 1 char over max
+        cy.get('localize[key="textbox_characters_exceed"]').contains('too many').should('exist');
+        cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
+        cy.get('.property-error').should('be.visible');
+
+        // Clean
+        cy.umbracoEnsureDataTypeNameNotExists(name);
+        cy.umbracoEnsureDocumentTypeNameNotExists(name);
+    })
+
     //   it('Tests Checkbox List', () => {
     //     const name = 'CheckBox List';
     //     const alias = AliasHelper.toAlias(name); 

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

@@ -0,0 +1,38 @@
+/// <reference types="Cypress" />
+context('Languages', () => {
+
+    beforeEach(() => {
+        cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'), false);
+      });
+
+    it('Deletes language', () => {
+        // Setup
+        const language1 = 'da';
+        const language2 = 'en-GB';
+        cy.umbracoEnsureLanguageNotExists(language1);
+        cy.umbracoEnsureLanguageNotExists(language2);
+        cy.umbracoCreateLanguage(language1, true, '1');
+        cy.umbracoCreateLanguage(language2, true, '1');
+        cy.umbracoSection('settings');
+
+        // Enter language tree and select the language we just created
+        cy.umbracoTreeItem('settings', ['Languages']).click();
+
+        // Assert there are 3 languages
+        cy.get('tbody > tr').should('have.length', 3);
+
+        // Delete the Danish language
+        cy.get('tr').contains('Danish').parents('tr').within(() => {
+            cy.get('umb-button[label-key="general_delete"]').click()
+        });
+        cy.umbracoButtonByLabelKey('contentTypeEditor_yesDelete').click();
+
+        // Assert there is only 2 language
+        cy.get('tbody > tr').should('have.length', 3);        
+
+        // Cleanup
+        cy.umbracoEnsureLanguageNotExists(language1);
+        cy.umbracoEnsureLanguageNotExists(language2);
+    });
+
+}); 

src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/memberGroups.js

@@ -1,4 +1,4 @@
-context('User Groups', () => {
+context('Member Groups', () => {
 
     beforeEach(() => {
         cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));

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

@@ -35,7 +35,7 @@ context('Document Types', () => {
     cy.get('#datatype-search').type('Textstring');
 
     // Choose first item
-    cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
+    cy.get('ul.umb-card-grid [title="Textstring"]').closest("li").click();
 
     // Save property
     cy.get('.btn-success').last().click();

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

@@ -34,7 +34,7 @@ context('Media Types', () => {
     cy.get('#datatype-search').type('Textstring');
 
     // Choose first item
-    cy.get('ul.umb-card-grid li [title="Textstring"]').closest("li").click();
+    cy.get('ul.umb-card-grid [title="Textstring"]').closest("li").click();
 
     // Save property
     cy.get('.btn-success').last().click();