Skip to content

fix (tests): Fix the unit tests (except for 2 synctests) #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix (tests): Fix the unit tests (except for 2 synctests) #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions samples/BlazorServer/Pages/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions tests/Blazored.FluentValidation.Tests/AssemblyScanning/Component.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/>
Expand Down
2 changes: 1 addition & 1 deletion tests/Blazored.FluentValidation.Tests/BasicValidation/Component.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
OnValidSubmit="ValidSubmit"
OnInvalidSubmit="InvalidSubmit">

<FluentValidationValidator/>
<FluentValidationValidator Options="@(options => options.IncludeRuleSets("Names").IncludeRulesNotInRuleSet())"/>
<ValidationSummary/>

<p>
Expand Down
2 changes: 1 addition & 1 deletion tests/Blazored.FluentValidation.Tests/FullFailureAccess/AsyncComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Model="@_person"
OnSubmit="Submit">

<FluentValidationValidator @ref="_fluentValidationValidator"/>
<FluentValidationValidator @ref="_fluentValidationValidator" Options="@(options => options.IncludeRuleSets("Names").IncludeRulesNotInRuleSet())"/>
<ValidationSummary/>

<p>
Expand Down
3 changes: 2 additions & 1 deletion tests/Blazored.FluentValidation.Tests/FullFailureAccess/SyncComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Model="@_person"
OnSubmit="Submit">

<FluentValidationValidator @ref="_fluentValidationValidator"/>
<FluentValidationValidator @ref="_fluentValidationValidator" Options="@(options => options.IncludeRuleSets("Names").IncludeRulesNotInRuleSet())"/>
<ValidationSummary/>

<p>
Expand Down Expand Up @@ -37,6 +37,7 @@
protected void Submit()
{
_fluentValidationValidator!.Validate();

var lastResult = _fluentValidationValidator!.GetFailuresFromLastValidation();
if (!lastResult.Any())
{
Expand Down
10 changes: 5 additions & 5 deletions tests/Blazored.FluentValidation.Tests/Model/Person.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Loading