From 31900e92845400f360566604f4af9f2b023d6284 Mon Sep 17 00:00:00 2001
From: Jason Finch <jason.finch@gmail.com>
Date: Thu, 20 Feb 2025 16:15:34 +1000
Subject: [PATCH] fix (tests): Fix the unit tests  (except for 2 synctests)

---
 samples/BlazorServer/Pages/Index.razor                 |  4 ++--
 .../AssemblyScanning/Component.razor                   |  4 ++--
 .../BasicValidation/Component.razor                    |  2 +-
 .../FullFailureAccess/AsyncComponent.razor             |  2 +-
 .../FullFailureAccess/SyncComponent.razor              |  3 ++-
 tests/Blazored.FluentValidation.Tests/Model/Person.cs  | 10 +++++-----
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/samples/BlazorServer/Pages/Index.razor b/samples/BlazorServer/Pages/Index.razor
index f227a9f..3b126ae 100644
--- a/samples/BlazorServer/Pages/Index.razor
+++ b/samples/BlazorServer/Pages/Index.razor
@@ -5,8 +5,8 @@
 <hr class="mb-5" />
 
 <EditForm Model="@_person" OnValidSubmit="@SubmitValidForm">
-    <FluentValidationValidator @ref="_fluentValidationValidator" DisableAssemblyScanning="@true" />
-    <ValidationSummary />
+    <FluentValidationValidator @ref="_fluentValidationValidator" DisableAssemblyScanning="@true"/>
+    <ValidationSummary/>
 
     <p>
         <label>First Name: </label>
diff --git a/tests/Blazored.FluentValidation.Tests/AssemblyScanning/Component.razor b/tests/Blazored.FluentValidation.Tests/AssemblyScanning/Component.razor
index ca9d7a3..2be9edd 100644
--- a/tests/Blazored.FluentValidation.Tests/AssemblyScanning/Component.razor
+++ b/tests/Blazored.FluentValidation.Tests/AssemblyScanning/Component.razor
@@ -5,11 +5,11 @@
 
     @if (DisableAssemblyScanning is null)
     {
-        <FluentValidationValidator />
+        <FluentValidationValidator Options="@(options => options.IncludeRuleSets("Names"))"/>
     }
     else
     {
-        <FluentValidationValidator DisableAssemblyScanning="DisableAssemblyScanning.Value" />
+        <FluentValidationValidator DisableAssemblyScanning="DisableAssemblyScanning.Value" Options="@(options => options.IncludeRuleSets("Names"))"/>
     }
 
     <ValidationSummary/>
diff --git a/tests/Blazored.FluentValidation.Tests/BasicValidation/Component.razor b/tests/Blazored.FluentValidation.Tests/BasicValidation/Component.razor
index 17b2f0f..e78225b 100644
--- a/tests/Blazored.FluentValidation.Tests/BasicValidation/Component.razor
+++ b/tests/Blazored.FluentValidation.Tests/BasicValidation/Component.razor
@@ -3,7 +3,7 @@
     OnValidSubmit="ValidSubmit"
     OnInvalidSubmit="InvalidSubmit">
 
-    <FluentValidationValidator/>
+    <FluentValidationValidator Options="@(options => options.IncludeRuleSets("Names").IncludeRulesNotInRuleSet())"/>
     <ValidationSummary/>
 
     <p>
diff --git a/tests/Blazored.FluentValidation.Tests/FullFailureAccess/AsyncComponent.razor b/tests/Blazored.FluentValidation.Tests/FullFailureAccess/AsyncComponent.razor
index 144144b..948b890 100644
--- a/tests/Blazored.FluentValidation.Tests/FullFailureAccess/AsyncComponent.razor
+++ b/tests/Blazored.FluentValidation.Tests/FullFailureAccess/AsyncComponent.razor
@@ -2,7 +2,7 @@
     Model="@_person"
     OnSubmit="Submit">
 
-    <FluentValidationValidator @ref="_fluentValidationValidator"/>
+    <FluentValidationValidator @ref="_fluentValidationValidator" Options="@(options => options.IncludeRuleSets("Names").IncludeRulesNotInRuleSet())"/>
     <ValidationSummary/>
 
     <p>
diff --git a/tests/Blazored.FluentValidation.Tests/FullFailureAccess/SyncComponent.razor b/tests/Blazored.FluentValidation.Tests/FullFailureAccess/SyncComponent.razor
index 4958393..3187cc2 100644
--- a/tests/Blazored.FluentValidation.Tests/FullFailureAccess/SyncComponent.razor
+++ b/tests/Blazored.FluentValidation.Tests/FullFailureAccess/SyncComponent.razor
@@ -2,7 +2,7 @@
     Model="@_person"
     OnSubmit="Submit">
 
-    <FluentValidationValidator @ref="_fluentValidationValidator"/>
+    <FluentValidationValidator @ref="_fluentValidationValidator" Options="@(options => options.IncludeRuleSets("Names").IncludeRulesNotInRuleSet())"/>
     <ValidationSummary/>
 
     <p>
@@ -37,6 +37,7 @@
     protected void Submit()
     {
         _fluentValidationValidator!.Validate();
+        
         var lastResult = _fluentValidationValidator!.GetFailuresFromLastValidation();
         if (!lastResult.Any())
         {
diff --git a/tests/Blazored.FluentValidation.Tests/Model/Person.cs b/tests/Blazored.FluentValidation.Tests/Model/Person.cs
index 0ab6ca6..a5751b0 100644
--- a/tests/Blazored.FluentValidation.Tests/Model/Person.cs
+++ b/tests/Blazored.FluentValidation.Tests/Model/Person.cs
@@ -41,6 +41,11 @@ public PersonValidator()
                 .NotNull().WithMessage(AgeRequired)
                 .GreaterThanOrEqualTo(0).WithMessage(AgeMin)
                 .LessThan(150).WithMessage(AgeMax);
+            
+            RuleFor(p => p.Age)
+                .NotEqual(69)
+                .WithMessage(AgeSuspect)
+                .WithSeverity(Severity.Warning);
 
             RuleFor(p => p.EmailAddress)
                 .NotEmpty().WithMessage(EmailRequired)
@@ -50,11 +55,6 @@ public PersonValidator()
             RuleFor(p => p.Address!)
                 .SetValidator(new AddressValidator())
                 .When(p => p.Address is not null);
-
-            RuleFor(p => p.Age)
-                .NotEqual(69)
-                .WithMessage(AgeSuspect)
-                .WithSeverity(Severity.Warning);
         }
 
         private static async Task<bool> IsUniqueAsync(string? email)