Merge pull request #1786 from riganti/fix-uitest-validation-dateonly

Fix UI test - DateOnly in RangeAttribute
riganti · Feb 25, 2024 · aea6b0b · aea6b0b
2 parents a07449c + cc78634
commit aea6b0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Samples/Common/ViewModels/FeatureSamples/Validation/ClientSideRulesViewModel.cs b/src/Samples/Common/ViewModels/FeatureSamples/Validation/ClientSideRulesViewModel.cs
@@ -15,8 +15,8 @@ public class ClientSideRulesViewModel : DotvvmViewModelBase
         [Range(12.345678901, double.PositiveInfinity)]
         public double? RangeFloat64 { get; set; } = null;
 
-        [Range(typeof(DateOnly), "2015-01-01", "2015-12-31")]
-        public DateOnly? RangeDate { get; set; } = null;
+        [Range(typeof(DateTime), "2015-01-01T00:00:00", "2015-12-31T23:59:59", ErrorMessage = "{0} must be between {1:s} and {2:s}.")]
+        public DateTime? RangeDate { get; set; } = null;
 
         [Required(AllowEmptyStrings = false)]
         public string RequiredString { get; set; } = "abc";

diff --git a/src/Samples/Common/Views/FeatureSamples/Validation/ClientSideRules.dothtml b/src/Samples/Common/Views/FeatureSamples/Validation/ClientSideRules.dothtml
@@ -26,7 +26,7 @@
             <td>Date Range in 2015</td>
             <td>
                 <dot:TextBox Text={value: RangeDate} Type=date />
-                <dot:TextBox Text={value: RangeDate} FormatString="yyyy-MM-dd"  data-ui="textbox-RangeDate" />
+                <dot:TextBox Text={value: RangeDate} FormatString="yyyy-MM-dd" data-ui="textbox-RangeDate" />
                 <dot:Button Click={staticCommand: RangeDate = null} data-ui="setnull-RangeDate">Set null</dot:Button>
             </td>
         <tr>

diff --git a/src/Samples/Tests/Tests/Feature/ValidationClientSideRulesTests.cs b/src/Samples/Tests/Tests/Feature/ValidationClientSideRulesTests.cs
@@ -90,7 +90,7 @@ void SetValue(IBrowserWrapper browser, string property, string value)
         [InlineData(null, null)]
         [InlineData("-1", "The field RangeInt32 must be between 10 and 20.")]
         [InlineData("0", "The field RangeInt32 must be between 10 and 20.")]
-        public void Feature_Validation_ClienSideRules_RangeInt32(string value, string error)
+        public void Feature_Validation_ClientSideRules_RangeInt32(string value, string error)
         {
             RunInAllBrowsers(browser => {
                 browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_Validation_ClientSideRules);
@@ -110,7 +110,7 @@ public void Feature_Validation_ClienSideRules_RangeInt32(string value, string er
         [InlineData(null, null)]
         [InlineData("12.345678900", "The field RangeFloat64 must be between 12.345678901 and ∞.")]
         // [InlineData("-Infinity", "The field RangeFloat64 must be between 12.345678901 and ∞.")]
-        public void Feature_Validation_ClienSideRules_RangeFloat64(string value, string error)
+        public void Feature_Validation_ClientSideRules_RangeFloat64(string value, string error)
         {
             RunInAllBrowsers(browser => {
                 browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_Validation_ClientSideRules);
@@ -128,8 +128,8 @@ public void Feature_Validation_ClienSideRules_RangeFloat64(string value, string
         [InlineData("2015-12-31", null)]
         [InlineData(null, null)]
         [InlineData("", null)]
-        [InlineData("2024-01-01", "The field RangeDate must be between 1/1/2015 and 12/31/2015.")]
-        public void Feature_Validation_ClienSideRules_RangeDate(string value, string error)
+        [InlineData("2024-01-01", "RangeDate must be between 2015-01-01T00:00:00 and 2015-12-31T23:59:59.")]
+        public void Feature_Validation_ClientSideRules_RangeDate(string value, string error)
         {
             RunInAllBrowsers(browser => {
                 browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_Validation_ClientSideRules);
@@ -148,7 +148,7 @@ public void Feature_Validation_ClienSideRules_RangeDate(string value, string err
         [InlineData("", "The RequiredString field is required.")]
         [InlineData("   ", "The RequiredString field is required.")]
         [InlineData(null, "The RequiredString field is required.")]
-        public void Feature_Validation_ClienSideRules_RequiredString(string value, string error)
+        public void Feature_Validation_ClientSideRules_RequiredString(string value, string error)
         {
             RunInAllBrowsers(browser => {
                 browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_Validation_ClientSideRules);
@@ -167,7 +167,7 @@ public void Feature_Validation_ClienSideRules_RequiredString(string value, strin
         [InlineData("", null)]
         [InlineData("   ", null)]
         [InlineData(null, "The NotNullString field is required.")]
-        public void Feature_Validation_ClienSideRules_NotNullString(string value, string error)
+        public void Feature_Validation_ClientSideRules_NotNullString(string value, string error)
         {
             RunInAllBrowsers(browser => {
                 browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_Validation_ClientSideRules);
@@ -186,7 +186,7 @@ public void Feature_Validation_ClienSideRules_NotNullString(string value, string
         [InlineData("@handle", "The EmailString field is not a valid e-mail address.")]
         [InlineData("incomplete@", "The EmailString field is not a valid e-mail address.")]
         [InlineData("", "The EmailString field is not a valid e-mail address.")]
-        public void Feature_Validation_ClienSideRules_EmailString(string value, string error)
+        public void Feature_Validation_ClientSideRules_EmailString(string value, string error)
         {
             RunInAllBrowsers(browser => {
                 browser.NavigateToUrl(SamplesRouteUrls.FeatureSamples_Validation_ClientSideRules);