Skip to content

Bump NSubstitute to 6.0.0, fix nullable-API test breaks #292

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

Merged
vgmello merged 1 commit into from
Jul 17, 2026
Merged

Bump NSubstitute to 6.0.0, fix nullable-API test breaks #292

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
15 changes: 15 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ All notable changes to this project are documented in this file, grouped by date

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [2026-07-17]

### Changed

- **Deps**: bumped `NSubstitute` from `5.3.0` to `6.0.0` (major). Fixed three test files
(`CreateCashierCommandHandlerTests`, `UpdateCashierCommandHandlerTests`, `CreateInvoiceCommandHandlerTests`)
that cast `CallInfo`'s indexer directly (`(T)x[0]`), which no longer compiles under 6.0's nullable-annotated
public API — switched to the null-safe `x.ArgAt<T>(0)` extension instead.

### Skipped

- **Deps**: `Refitter.MSBuild` `2.0.0` → `2.1.0` was left in place — 2.1.0 refactored the MSBuild task itself
(upstream decoupled the CLI binary from the task) and fails code generation locally with
`MissingMethodException: System.Text.ValueStringBuilder.AsSpan()`. Needs an upstream fix before retrying.

## [2026-07-16]

### Changed
Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<PackageVersion Include="Momentum.ServiceDefaults.Api" Version="$(MomentumVersion)" />
<PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
<PackageVersion Include="Npgsql" Version="10.0.3" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute" Version="6.0.0" />
<PackageVersion Include="OneOf" Version="3.0.271" />
<PackageVersion Include="OneOf.SourceGenerator" Version="3.0.271" />
<PackageVersion Include="Refit" Version="13.1.0" />
Expand Down
16 changes: 8 additions & 8 deletions tests/AppDomain.Tests/Unit/Cashier/CreateCashierCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ public async Task Handle_WithValidCommand_ShouldCreateCashierAndReturnResult()
messagingMock.InvokeCommandAsync(Arg.Any<CreateCashierCommandHandler.DbCommand>(), Arg.Any<CancellationToken>())
.Returns(x => new AppDomain.Cashiers.Data.Entities.Cashier
{
TenantId = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.TenantId,
CashierId = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.CashierId,
Name = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.Name,
Email = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.Email,
TenantId = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.TenantId,
CashierId = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.CashierId,
Name = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.Name,
Email = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.Email,
CreatedDateUtc = DateTime.UtcNow,
UpdatedDateUtc = DateTime.UtcNow,
Version = 12345 // Some mock xmin value
Expand Down Expand Up @@ -65,10 +65,10 @@ public async Task Handle_ShouldGenerateUniqueGuidForEachCall()
messagingMock.InvokeCommandAsync(Arg.Any<CreateCashierCommandHandler.DbCommand>(), Arg.Any<CancellationToken>())
.Returns(x => new AppDomain.Cashiers.Data.Entities.Cashier
{
TenantId = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.TenantId,
CashierId = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.CashierId,
Name = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.Name,
Email = ((CreateCashierCommandHandler.DbCommand)x[0]).Cashier.Email,
TenantId = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.TenantId,
CashierId = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.CashierId,
Name = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.Name,
Email = x.ArgAt<CreateCashierCommandHandler.DbCommand>(0).Cashier.Email,
CreatedDateUtc = DateTime.UtcNow,
UpdatedDateUtc = DateTime.UtcNow,
Version = 12345 // Some mock xmin value
Expand Down
14 changes: 7 additions & 7 deletions tests/AppDomain.Tests/Unit/Cashier/UpdateCashierCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ public async Task Handle_WithValidCashier_ShouldUpdateAndReturnResult()
messagingMock.InvokeCommandAsync(Arg.Any<UpdateCashierCommandHandler.DbCommand>(), Arg.Any<CancellationToken>())
.Returns(x => new CashierEntity
{
TenantId = ((UpdateCashierCommandHandler.DbCommand)x[0]).TenantId,
CashierId = ((UpdateCashierCommandHandler.DbCommand)x[0]).CashierId,
Name = ((UpdateCashierCommandHandler.DbCommand)x[0]).Name,
Email = ((UpdateCashierCommandHandler.DbCommand)x[0]).Email,
TenantId = x.ArgAt<UpdateCashierCommandHandler.DbCommand>(0).TenantId,
CashierId = x.ArgAt<UpdateCashierCommandHandler.DbCommand>(0).CashierId,
Name = x.ArgAt<UpdateCashierCommandHandler.DbCommand>(0).Name,
Email = x.ArgAt<UpdateCashierCommandHandler.DbCommand>(0).Email,
CreatedDateUtc = DateTime.UtcNow,
UpdatedDateUtc = DateTime.UtcNow,
Version = 2 // Version should be incremented after update
Expand Down Expand Up @@ -99,9 +99,9 @@ public async Task Handle_WithNullEmail_ShouldReturnNotUpdatedForEmail()
messagingMock.InvokeCommandAsync(Arg.Any<UpdateCashierCommandHandler.DbCommand>(), Arg.Any<CancellationToken>())
.Returns(x => new CashierEntity
{
TenantId = ((UpdateCashierCommandHandler.DbCommand)x[0]).TenantId,
CashierId = ((UpdateCashierCommandHandler.DbCommand)x[0]).CashierId,
Name = ((UpdateCashierCommandHandler.DbCommand)x[0]).Name,
TenantId = x.ArgAt<UpdateCashierCommandHandler.DbCommand>(0).TenantId,
CashierId = x.ArgAt<UpdateCashierCommandHandler.DbCommand>(0).CashierId,
Name = x.ArgAt<UpdateCashierCommandHandler.DbCommand>(0).Name,
Email = "Not Updated", // When email is null in command, it should remain unchanged (original value)
CreatedDateUtc = DateTime.UtcNow,
UpdatedDateUtc = DateTime.UtcNow,
Expand Down
42 changes: 21 additions & 21 deletions tests/AppDomain.Tests/Unit/Invoices/CreateInvoiceCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ public async Task Handle_WithValidCommand_ShouldCreateInvoiceAndReturnResult()
messagingMock.InvokeCommandAsync(Arg.Any<CreateInvoiceCommandHandler.DbCommand>(), Arg.Any<CancellationToken>())
.Returns(x => new AppDomain.Invoices.Data.Entities.Invoice
{
TenantId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.TenantId,
InvoiceId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.InvoiceId,
Name = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Name,
TenantId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.TenantId,
InvoiceId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.InvoiceId,
Name = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Name,
Status = nameof(InvoiceStatus.Draft),
Amount = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Amount,
Currency = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Currency,
DueDate = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.DueDate,
CashierId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.CashierId,
Amount = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Amount,
Currency = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Currency,
DueDate = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.DueDate,
CashierId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.CashierId,
CreatedDateUtc = DateTime.UtcNow,
UpdatedDateUtc = DateTime.UtcNow,
Version = 1 // Initial version for new entity
Expand Down Expand Up @@ -81,14 +81,14 @@ public async Task Handle_WithDefaults_ShouldUseDefaultValues()
messagingMock.InvokeCommandAsync(Arg.Any<CreateInvoiceCommandHandler.DbCommand>(), Arg.Any<CancellationToken>())
.Returns(x => new AppDomain.Invoices.Data.Entities.Invoice
{
TenantId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.TenantId,
InvoiceId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.InvoiceId,
Name = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Name,
TenantId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.TenantId,
InvoiceId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.InvoiceId,
Name = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Name,
Status = nameof(InvoiceStatus.Draft),
Amount = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Amount,
Currency = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Currency,
DueDate = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.DueDate,
CashierId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.CashierId,
Amount = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Amount,
Currency = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Currency,
DueDate = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.DueDate,
CashierId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.CashierId,
CreatedDateUtc = DateTime.UtcNow,
UpdatedDateUtc = DateTime.UtcNow,
Version = 1 // Initial version for new entity
Expand Down Expand Up @@ -117,14 +117,14 @@ public async Task Handle_ShouldGenerateUniqueGuidForEachCall()
messagingMock.InvokeCommandAsync(Arg.Any<CreateInvoiceCommandHandler.DbCommand>(), Arg.Any<CancellationToken>())
.Returns(x => new AppDomain.Invoices.Data.Entities.Invoice
{
TenantId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.TenantId,
InvoiceId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.InvoiceId,
Name = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Name,
TenantId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.TenantId,
InvoiceId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.InvoiceId,
Name = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Name,
Status = nameof(InvoiceStatus.Draft),
Amount = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Amount,
Currency = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.Currency,
DueDate = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.DueDate,
CashierId = ((CreateInvoiceCommandHandler.DbCommand)x[0]).Invoice.CashierId,
Amount = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Amount,
Currency = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.Currency,
DueDate = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.DueDate,
CashierId = x.ArgAt<CreateInvoiceCommandHandler.DbCommand>(0).Invoice.CashierId,
CreatedDateUtc = DateTime.UtcNow,
UpdatedDateUtc = DateTime.UtcNow,
Version = 1 // Initial version for new entity
Expand Down
Loading