Merge pull request #747 from dlwyatt/MockFix3

Fixes #746 - Incorrect Mock call history scopes

Author: nohwnd

Functions/Describe.Tests.ps1

@@ -24,6 +24,14 @@ InModuleScope Pester {
         function MockMe { param ($Name) }
         Mock MockMe
 
+        BeforeEach {
+            $testState.EnterTest()
+        }
+
+        AfterEach {
+            $testState.LeaveTest()
+        }
+
         Context 'Handling errors in the Fixture' {
             $testState = New-PesterState -Path $TestDrive
 

Functions/It.ps1

@@ -246,6 +246,7 @@ function Invoke-Test
             $errorRecord = $null
             try
             {
+                $pester.EnterTest()
                 Invoke-TestCaseSetupBlocks
 
                 do
@@ -271,6 +272,8 @@ function Invoke-Test
                 {
                     $errorRecord = $_
                 }
+
+                $pester.LeaveTest()
             }
 
             $result = ConvertTo-PesterResult -ErrorRecord $errorRecord

Functions/Mock.Tests.ps1

@@ -1720,6 +1720,31 @@ Describe 'Passing unbound script blocks as mocks' {
     }
 }
 
+Describe 'Assert-MockCalled when mock called outside of It block' {
+    function TestMe { 'Original ' }
+    mock TestMe { 'Mocked' }
+
+    $null = TestMe
+
+    Context 'Context' {
+        $null = TestMe
+
+        It 'Should log the correct number of calls' {
+            TestMe | Should -Be Mocked
+            Assert-MockCalled TestMe -Scope It -Exactly -Times 1
+            Assert-MockCalled TestMe -Scope Context -Exactly -Times 2
+            Assert-MockCalled TestMe -Scope Describe -Exactly -Times 3
+        }
+
+        It 'Should log the correct number of calls (second test)' {
+            TestMe | Should -Be Mocked
+            Assert-MockCalled TestMe -Scope It -Exactly -Times 1
+            Assert-MockCalled TestMe -Scope Context -Exactly -Times 3
+            Assert-MockCalled TestMe -Scope Describe -Exactly -Times 4
+        }
+    }
+}
+
 Describe "Restoring original commands when mock scopes exit" {
     function a (){}
     Context "first context" {

Functions/Mock.ps1

@@ -1077,8 +1077,8 @@ function ExecuteBlock
 
     $Block.Verifiable = $false
 
-    # We set Scope to $null here to indicate the call came from the current Test Case.  It'll get assigned to a test group scope when Exit-MockScope is called.
-    $Mock.CallHistory += @{CommandName = "$ModuleName||$CommandName"; BoundParams = $BoundParameters; Args = $ArgumentList; Scope = $null }
+    $scope = if ($pester.InTest) { $null } else { $pester.CurrentTestGroup }
+    $Mock.CallHistory += @{CommandName = "$ModuleName||$CommandName"; BoundParams = $BoundParameters; Args = $ArgumentList; Scope = $scope }
 
     $scriptBlock = {
         param (

Functions/PesterState.ps1

@@ -50,6 +50,7 @@ function New-PesterState
         $script:CommandCoverage = @()
         $script:Strict = $Strict
         $script:Show = $Show
+        $script:InTest = $false
 
         $script:TestResult = @()
 
@@ -297,6 +298,21 @@ function New-PesterState
             return $script:TestGroupStack.Peek().AfterAll
         }
 
+        function EnterTest
+        {
+            if ($script:InTest)
+            {
+                throw 'You are already in a test case.'
+            }
+
+            $script:InTest = $true
+        }
+
+        function LeaveTest
+        {
+            $script:InTest = $false
+        }
+
         $ExportedVariables = "TagFilter",
         "ExcludeTagFilter",
         "TestNameFilter",
@@ -315,7 +331,8 @@ function New-PesterState
         "IncludeVSCodeMarker",
         "TestActions",
         "TestGroupStack",
-        "TestSuiteName"
+        "TestSuiteName",
+        "InTest"
 
         $ExportedFunctions = "EnterTestGroup",
                              "LeaveTestGroup",
@@ -324,7 +341,9 @@ function New-PesterState
                              "GetTestCaseSetupBlocks",
                              "GetTestCaseTeardownBlocks",
                              "GetCurrentTestGroupSetupBlocks",
-                             "GetCurrentTestGroupTeardownBlocks"
+                             "GetCurrentTestGroupTeardownBlocks",
+                             "EnterTest",
+                             "LeaveTest"
 
         & $SafeCommands['Export-ModuleMember'] -Variable $ExportedVariables -function $ExportedFunctions
     }  |