Forward merge rel/5.3.x (pester#2163)

Co-authored-by: James Steele <[email protected]> Co-authored-by: Jakub Jareš <[email protected]> Co-authored-by: Frode Flaten <[email protected]> Co-authored-by: Aaron Jensen <[email protected]>
cjvandyk · Apr 22, 2022 · 48c3abc · 48c3abc
1 parent 4370ecc
commit 48c3abc
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 9 deletions.
diff --git a/src/Pester.psd1 b/src/Pester.psd1
@@ -4,7 +4,7 @@
     RootModule        = 'Pester.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '5.3.0'
+    ModuleVersion     = '5.3.1'
 
     # ID used to uniquely identify this module
     GUID              = 'a699dea5-2c73-4616-a270-1f7abb777e71'

diff --git a/src/csharp/Pester/DictionaryExtensions.cs b/src/csharp/Pester/DictionaryExtensions.cs
@@ -76,11 +76,11 @@ public static T[] GetArrayOrNull<T>(this IDictionary dictionary, string key) whe
                 if (dictionary[key] is PSObject o)
                     return new[] { (T)Convert.ChangeType(o.ToString(), typeof(string)) };
 
-            if (value is object[] v)
+            if (value is IList v)
             {
                 try
                 {
-                    var arr = new T[v.Length];
+                    var arr = new T[v.Count];
 
                     var i = 0;
                     foreach (var j in v)

diff --git a/src/functions/Coverage.ps1 b/src/functions/Coverage.ps1
@@ -1204,8 +1204,7 @@ function Get-TracerHitLocation ($command) {
         # we also must avoid selecting a parent that is too high, otherwise we might mark code that was not covered as covered.
         if ($parent -is [System.Management.Automation.Language.IfStatementAst] -or
             $parent -is [System.Management.Automation.Language.ScriptBlockAst] -or
-            $parent -is [System.Management.Automation.Language.ForStatementAst] -or
-            $parent -is [System.Management.Automation.Language.ForEachStatementAst] -or
+            $parent -is [System.Management.Automation.Language.LoopStatementAst] -or
             $parent -is [System.Management.Automation.Language.SwitchStatementAst] -or
             $parent -is [System.Management.Automation.Language.TryStatementAst] -or
             $parent -is [System.Management.Automation.Language.CatchClauseAst]) {

diff --git a/src/functions/Describe.ps1 b/src/functions/Describe.ps1
@@ -146,7 +146,7 @@ function Invoke-Interactively ($CommandUsed, $ScriptName, $SessionState, $BoundP
         $invokePester = {
             param($private:Path, $private:ScriptParameters, $private:Out_Null)
             $private:c = New-PesterContainer -Path $Path -Data $ScriptParameters
-            Invoke-Pester -Container $c Path | & $Out_Null
+            Invoke-Pester -Container $c | & $Out_Null
         }
 
         # get PSBoundParameters from caller script to allow interactive execution of parameterized tests.

diff --git a/src/functions/New-MockObject.ps1 b/src/functions/New-MockObject.ps1
@@ -99,11 +99,11 @@ https://pester.dev/docs/usage/mocking
             $historyName = "$($MethodHistoryPrefix)$($method.Key)"
             $mockState = $mock.PSObject.Properties.Item("__mock")
             if (-not $mockState) {
-                $mockState = @{}
-                $mock.PSObject.Properties.Add([Pester.Factory]::CreateNoteProperty("__mock", $mockState))
+                $mockState = [Pester.Factory]::CreateNoteProperty("__mock", @{});
+                $mock.PSObject.Properties.Add($mockState)
             }
 
-            $mockState[$historyName] = @{
+            $mockState.Value[$historyName] = @{
                 Count  = 0
                 Method = $method.Value
             }

diff --git a/tst/CoverageTestFile.ps1 b/tst/CoverageTestFile.ps1
@@ -113,3 +113,9 @@ catch {
 finally {
     $aaa = $true
 }
+
+$findIf = $true
+while ($findIf) {
+    [string]$PartialText = "AAA"
+    $findIf = $false
+}
diff --git a/tst/PesterConfiguration.Tests.ps1 b/tst/PesterConfiguration.Tests.ps1
@@ -26,3 +26,12 @@ Describe "PesterConfiguration.Format.ps1xml" {
         }
     }
 }
+
+Describe 'PesterConfiguration' {
+    It 'should convert arraylists' {
+        $expectedPaths = @('one', 'two', 'three')
+        $pathList = [Collections.ArrayList]$expectedPaths
+        $config = [PesterConfiguration]@{ Run = @{ Path = $pathList } }
+        $config.Run.Path.Value | Should -Be $expectedPaths
+    }
+}
diff --git a/tst/functions/New-MockObject.Tests.ps1 b/tst/functions/New-MockObject.Tests.ps1
@@ -56,6 +56,16 @@ Describe 'New-MockObject' {
             $mockObject._Kill[-1].Call | Should -Be 2
             $mockObject._Kill[-1].Arguments | Should -Be $true
         }
+
+        It "Adds 2 methods to the object" {
+            $mockObject = New-MockObject -Type 'Net.Sockets.TcpClient' -Methods @{
+                Connect = { param($Server, $Port)"connect" };
+                Close   = { param($Server, $Port)"close" }
+            }
+
+            $mockObject.Connect() | Should -Be "connect"
+            $mockObject.Close() | Should -Be "close"
+        }
     }