yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/15.0' into v15/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Services/DocumentUrlService.cs
This commit is contained in:
nikolajlauridsen
2024-11-04 12:49:38 +01:00
parent e50a1dc015 691ca2827d
commit 8f86ac1bd1
79 changed files with 1938 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
View File

@@ -3,6 +3,7 @@
using System.Text.Json.Nodes;
using NUnit.Framework;
using Umbraco.Cms.Core.Models.Validation;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Infrastructure.Serialization;
@@ -23,7 +24,8 @@ public class ColorListValidatorTest
validator.Validate(
"hello",
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(1, result.Count());
}
@@ -35,7 +37,8 @@ public class ColorListValidatorTest
validator.Validate(
new JsonArray("hello", "world"),
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(1, result.Count());
}
@@ -51,7 +54,8 @@ public class ColorListValidatorTest
JsonNode.Parse("""{"value": "ABC", "label": "Three"}"""),
JsonNode.Parse("""{"value": "1234567", "label": "Four"}""")),
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(2, result.Count());
}
}

28
tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
View File

@@ -3,6 +3,7 @@
using System.Text.Json.Nodes;
using NUnit.Framework;
using Umbraco.Cms.Core.Models.Validation;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Infrastructure.Serialization;
@@ -22,7 +23,8 @@ public class EnsureUniqueValuesValidatorTest
var result = validator.Validate(
"hello",
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(1, result.Count());
}
@@ -34,7 +36,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
new JsonArray("hello", "world"),
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(0, result.Count());
}
@@ -46,7 +49,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
new JsonArray("one", "two", "three"),
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(0, result.Count());
}
@@ -58,7 +62,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
new JsonArray("one", "one"),
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(1, result.Count());
}
@@ -70,7 +75,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
new JsonArray("one", "two", "three", "one", "two"),
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(2, result.Count());
}
@@ -82,7 +88,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
null,
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(0, result.Count());
}
@@ -95,7 +102,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
value,
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(0, result.Count());
}
@@ -108,7 +116,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
value,
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(0, result.Count());
}
@@ -121,7 +130,8 @@ public class EnsureUniqueValuesValidatorTest
validator.Validate(
value,
null,
null);
null,
PropertyValidationContext.Empty());
Assert.AreEqual(0, result.Count());
}
}