From 67422c17b16549af8c375a3075e2ed13cf1c6974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Fri, 31 Jul 2026 17:23:50 +0200 Subject: [PATCH] Fix #2933: make Actual parameter position consistent across the new assertions --- src/functions/assert/Boolean/Should-BeFalse.ps1 | 2 +- src/functions/assert/Boolean/Should-BeFalsy.ps1 | 2 +- src/functions/assert/Boolean/Should-BeTrue.ps1 | 2 +- src/functions/assert/Boolean/Should-BeTruthy.ps1 | 2 +- src/functions/assert/General/Should-BeNull.ps1 | 2 +- src/functions/assert/General/Should-NotBeNull.ps1 | 2 +- src/functions/assert/Time/Should-BeAfter.ps1 | 2 +- src/functions/assert/Time/Should-BeBefore.ps1 | 2 +- tst/functions/assert/Boolean/Should-BeFalse.Tests.ps1 | 3 ++- tst/functions/assert/Boolean/Should-BeFalsy.Tests.ps1 | 3 ++- tst/functions/assert/Boolean/Should-BeTrue.Tests.ps1 | 3 ++- tst/functions/assert/Boolean/Should-BeTruthy.Tests.ps1 | 3 ++- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/functions/assert/Boolean/Should-BeFalse.ps1 b/src/functions/assert/Boolean/Should-BeFalse.ps1 index 7eb79239d..f0dc901ea 100644 --- a/src/functions/assert/Boolean/Should-BeFalse.ps1 +++ b/src/functions/assert/Boolean/Should-BeFalse.ps1 @@ -47,7 +47,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding()] param ( - [Parameter(ValueFromPipeline = $true)] + [Parameter(Position = 0, ValueFromPipeline = $true)] $Actual, [String]$Because ) diff --git a/src/functions/assert/Boolean/Should-BeFalsy.ps1 b/src/functions/assert/Boolean/Should-BeFalsy.ps1 index 1b0d0f35e..6ce4cf96b 100644 --- a/src/functions/assert/Boolean/Should-BeFalsy.ps1 +++ b/src/functions/assert/Boolean/Should-BeFalsy.ps1 @@ -47,7 +47,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding()] param ( - [Parameter(ValueFromPipeline = $true)] + [Parameter(Position = 0, ValueFromPipeline = $true)] $Actual, [String]$Because ) diff --git a/src/functions/assert/Boolean/Should-BeTrue.ps1 b/src/functions/assert/Boolean/Should-BeTrue.ps1 index 892b8d253..5fa5c93cb 100644 --- a/src/functions/assert/Boolean/Should-BeTrue.ps1 +++ b/src/functions/assert/Boolean/Should-BeTrue.ps1 @@ -47,7 +47,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding()] param ( - [Parameter(ValueFromPipeline = $true)] + [Parameter(Position = 0, ValueFromPipeline = $true)] $Actual, [String]$Because ) diff --git a/src/functions/assert/Boolean/Should-BeTruthy.ps1 b/src/functions/assert/Boolean/Should-BeTruthy.ps1 index 02a218e46..69ca22247 100644 --- a/src/functions/assert/Boolean/Should-BeTruthy.ps1 +++ b/src/functions/assert/Boolean/Should-BeTruthy.ps1 @@ -48,7 +48,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding()] param ( - [Parameter(ValueFromPipeline = $true)] + [Parameter(Position = 0, ValueFromPipeline = $true)] $Actual, [String]$Because ) diff --git a/src/functions/assert/General/Should-BeNull.ps1 b/src/functions/assert/General/Should-BeNull.ps1 index 8125e3c1b..b0e4b7108 100644 --- a/src/functions/assert/General/Should-BeNull.ps1 +++ b/src/functions/assert/General/Should-BeNull.ps1 @@ -34,7 +34,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding()] param ( - [Parameter(Position = 1, ValueFromPipeline = $true)] + [Parameter(Position = 0, ValueFromPipeline = $true)] $Actual, [String]$Because ) diff --git a/src/functions/assert/General/Should-NotBeNull.ps1 b/src/functions/assert/General/Should-NotBeNull.ps1 index 42ddb5aff..e3c6c012b 100644 --- a/src/functions/assert/General/Should-NotBeNull.ps1 +++ b/src/functions/assert/General/Should-NotBeNull.ps1 @@ -34,7 +34,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding()] param ( - [Parameter(Position = 1, ValueFromPipeline = $true)] + [Parameter(Position = 0, ValueFromPipeline = $true)] $Actual, [String]$Because ) diff --git a/src/functions/assert/Time/Should-BeAfter.ps1 b/src/functions/assert/Time/Should-BeAfter.ps1 index 8bc7af997..5bbfadd2b 100644 --- a/src/functions/assert/Time/Should-BeAfter.ps1 +++ b/src/functions/assert/Time/Should-BeAfter.ps1 @@ -71,7 +71,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding(DefaultParameterSetName = "Now")] param ( - [Parameter(Position = 2, ValueFromPipeline = $true)] + [Parameter(Position = 1, ValueFromPipeline = $true)] $Actual, [Parameter(ParameterSetName = "Now")] diff --git a/src/functions/assert/Time/Should-BeBefore.ps1 b/src/functions/assert/Time/Should-BeBefore.ps1 index 36c71dfcc..07a217903 100644 --- a/src/functions/assert/Time/Should-BeBefore.ps1 +++ b/src/functions/assert/Time/Should-BeBefore.ps1 @@ -71,7 +71,7 @@ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseProcessBlockForPipelineCommand', '')] [CmdletBinding(DefaultParameterSetName = "Now")] param ( - [Parameter(Position = 2, ValueFromPipeline = $true)] + [Parameter(Position = 1, ValueFromPipeline = $true)] $Actual, [Parameter(ParameterSetName = "Now")] diff --git a/tst/functions/assert/Boolean/Should-BeFalse.Tests.ps1 b/tst/functions/assert/Boolean/Should-BeFalse.Tests.ps1 index 97fd1a9ce..73456f2c7 100644 --- a/tst/functions/assert/Boolean/Should-BeFalse.Tests.ps1 +++ b/tst/functions/assert/Boolean/Should-BeFalse.Tests.ps1 @@ -29,6 +29,7 @@ Describe "Should-BeFalse" { } It "Can be called with positional parameters" { - { Should-BeFalse $true } | Verify-AssertionFailed + $err = { Should-BeFalse $true } | Verify-AssertionFailed + $err.Exception.Message | Verify-Equal "Expected [bool] `$false, but got: [bool] `$true." } } diff --git a/tst/functions/assert/Boolean/Should-BeFalsy.Tests.ps1 b/tst/functions/assert/Boolean/Should-BeFalsy.Tests.ps1 index 33cd0d2ed..385560ed7 100644 --- a/tst/functions/assert/Boolean/Should-BeFalsy.Tests.ps1 +++ b/tst/functions/assert/Boolean/Should-BeFalsy.Tests.ps1 @@ -30,6 +30,7 @@ Describe "Should-BeFalsy" { } It "Can be called with positional parameters" { - { Should-BeFalsy $true } | Verify-AssertionFailed + $err = { Should-BeFalsy $true } | Verify-AssertionFailed + $err.Exception.Message | Verify-Equal "Expected [bool] `$false or a falsy value: 0, `"`", `$null or @(), but got: [bool] `$true." } } diff --git a/tst/functions/assert/Boolean/Should-BeTrue.Tests.ps1 b/tst/functions/assert/Boolean/Should-BeTrue.Tests.ps1 index f9b290c79..cb164dda2 100644 --- a/tst/functions/assert/Boolean/Should-BeTrue.Tests.ps1 +++ b/tst/functions/assert/Boolean/Should-BeTrue.Tests.ps1 @@ -26,6 +26,7 @@ Describe "Should-BeTrue" { } It "Can be called with positional parameters" { - { Should-BeTrue $false } | Verify-AssertionFailed + $err = { Should-BeTrue $false } | Verify-AssertionFailed + $err.Exception.Message | Verify-Equal "Expected [bool] `$true, but got: [bool] `$false." } } diff --git a/tst/functions/assert/Boolean/Should-BeTruthy.Tests.ps1 b/tst/functions/assert/Boolean/Should-BeTruthy.Tests.ps1 index 2834d25f9..9d3274968 100644 --- a/tst/functions/assert/Boolean/Should-BeTruthy.Tests.ps1 +++ b/tst/functions/assert/Boolean/Should-BeTruthy.Tests.ps1 @@ -25,6 +25,7 @@ Describe "Should-BeTruthy" { } It "Can be called with positional parameters" { - { Should-BeTruthy $false } | Verify-AssertionFailed + $err = { Should-BeTruthy $false } | Verify-AssertionFailed + $err.Exception.Message | Verify-Equal "Expected [bool] `$true or a truthy value, but got: [bool] `$false." } }