From b4de7b5cb543297d9b384d8e44d4a2450c95e299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Fri, 31 Jul 2026 17:18:34 +0200
Subject: [PATCH] Fix #2929: remove non-working -StrictOrder from
 Should-BeEquivalent

---
 .../Equivalence/Should-BeEquivalent.ps1       | 68 +++++++------------
 .../Equivalence/Should-BeEquivalent.Tests.ps1 |  2 -
 2 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/src/functions/assert/Equivalence/Should-BeEquivalent.ps1 b/src/functions/assert/Equivalence/Should-BeEquivalent.ps1
index ccaead993..932feb176 100644
--- a/src/functions/assert/Equivalence/Should-BeEquivalent.ps1
+++ b/src/functions/assert/Equivalence/Should-BeEquivalent.ps1
@@ -77,40 +77,29 @@ function Compare-CollectionEquivalent ($Expected, $Actual, $Property, $Options)
     $notFound = @()
     $anyDifferent = $false
     for ($e = 0; $e -lt $eEnd; $e++) {
-        # todo: retest strict order
         Write-EquivalenceResult "`nSearching for `$Expected[$e]:"
         $currentExpected = $Expected[$e]
         $found = $false
-        if ($StrictOrder) {
-            $currentActual = $Actual[$e]
-            if ($taken -notcontains $e -and (-not (Compare-Equivalent -Expected $currentExpected -Actual $currentActual -Path $Property -Options $Options))) {
-                $taken += $e
-                $found = $true
-                Write-EquivalenceResult -Equivalence "`Found `$Expected[$e]."
+        for ($a = 0; $a -lt $aEnd; $a++) {
+            # we already took this item as equivalent to an item
+            # in the expected collection, skip it
+            if ($taken -contains $a) {
+                Write-EquivalenceResult "Skipping `$Actual[$a] because it is already taken."
+                continue
             }
-        }
-        else {
-            for ($a = 0; $a -lt $aEnd; $a++) {
-                # we already took this item as equivalent to an item
-                # in the expected collection, skip it
-                if ($taken -contains $a) {
-                    Write-EquivalenceResult "Skipping `$Actual[$a] because it is already taken."
-                    continue
-                }
-                $currentActual = $Actual[$a]
-                # -not, because $null means no differences, and some strings means there are differences
-                Write-EquivalenceResult "Comparing `$Actual[$a] to `$Expected[$e] to see if they are equivalent."
-                if (-not (Compare-Equivalent -Expected $currentExpected -Actual $currentActual -Path $Property -Options $Options)) {
-                    # add the index to the list of taken items so we can skip it
-                    # in the search, this way we can compare collections with
-                    # arrays multiple same items
-                    $taken += $a
-                    $found = $true
-                    Write-EquivalenceResult -Equivalence "`Found equivalent item for `$Expected[$e] at `$Actual[$a]."
-                    # we already found the item we
-                    # can move on to the next item in Expected array
-                    break
-                }
+            $currentActual = $Actual[$a]
+            # -not, because $null means no differences, and some strings means there are differences
+            Write-EquivalenceResult "Comparing `$Actual[$a] to `$Expected[$e] to see if they are equivalent."
+            if (-not (Compare-Equivalent -Expected $currentExpected -Actual $currentActual -Path $Property -Options $Options)) {
+                # add the index to the list of taken items so we can skip it
+                # in the search, this way we can compare collections with
+                # arrays multiple same items
+                $taken += $a
+                $found = $true
+                Write-EquivalenceResult -Equivalence "`Found equivalent item for `$Expected[$e] at `$Actual[$a]."
+                # we already found the item we
+                # can move on to the next item in Expected array
+                break
             }
         }
         if (-not $found) {
@@ -159,22 +148,13 @@ function Compare-DataTableEquivalent ($Expected, $Actual, $Property, $Options) {
     for ($e = 0; $e -lt $eEnd; $e++) {
         $currentExpected = $Expected.Rows[$e]
         $found = $false
-        if ($StrictOrder) {
-            $currentActual = $Actual.Rows[$e]
-            if ((-not (Compare-Equivalent -Expected $currentExpected -Actual $currentActual -Path $Property -Options $Options)) -and $taken -notcontains $e) {
-                $taken += $e
+        for ($a = 0; $a -lt $aEnd; $a++) {
+            $currentActual = $Actual.Rows[$a]
+            if ((-not (Compare-Equivalent -Expected $currentExpected -Actual $currentActual -Path $Property -Options $Options)) -and $taken -notcontains $a) {
+                $taken += $a
                 $found = $true
             }
         }
-        else {
-            for ($a = 0; $a -lt $aEnd; $a++) {
-                $currentActual = $Actual.Rows[$a]
-                if ((-not (Compare-Equivalent -Expected $currentExpected -Actual $currentActual -Path $Property -Options $Options)) -and $taken -notcontains $a) {
-                    $taken += $a
-                    $found = $true
-                }
-            }
-        }
         if (-not $found) {
             $notFound += $currentExpected
         }
@@ -709,8 +689,6 @@ function Should-BeEquivalent {
         [switch] $ExcludePathsNotOnExpected,
         [ValidateSet('Equivalency', 'Equality')]
         [string] $Comparator = 'Equivalency'
-        # TODO: I am not sure this works.
-        # [Switch] $StrictOrder
     )
 
     $options = Get-EquivalencyOption -ExcludePath:$ExcludePath -ExcludePathsNotOnExpected:$ExcludePathsNotOnExpected -Comparator:$Comparator
diff --git a/tst/functions/assert/Equivalence/Should-BeEquivalent.Tests.ps1 b/tst/functions/assert/Equivalence/Should-BeEquivalent.Tests.ps1
index 514030051..6148048c0 100644
--- a/tst/functions/assert/Equivalence/Should-BeEquivalent.Tests.ps1
+++ b/tst/functions/assert/Equivalence/Should-BeEquivalent.Tests.ps1
@@ -477,8 +477,6 @@ InPesterModuleScope {
             Should-BeEquivalent -Actual $ActualDeserialized -Expected $ExpectedDeserialized
             Should-BeEquivalent -Actual $Actual -Expected $ExpectedDeserialized
 
-            { Should-BeEquivalent -Actual $Actual -Expected $Expected -StrictOrder } | Should -Throw
-
             $Actual.Rows[1].Name = 'D'
             { Should-BeEquivalent -Actual $Actual -Expected $Expected } | Should -Throw