fix test result summary, broken exit code and batch file exit

ferventcoder · Sep 12, 2012 · d8012bd · d8012bd
2 parents 4033c57 + bd27373
commit d8012bd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Functions/It.ps1 b/Functions/It.ps1
@@ -1,5 +1,6 @@
 function It($name, [ScriptBlock] $test) 
 {
+    if($test_name -ne $Null -and $test_name.ToLower() -ne $name) {return}
     $results = Get-GlobalTestResults
     $margin = " " * $results.TestDepth
     $error_margin = $margin * 2

diff --git a/Functions/TestResults.ps1 b/Functions/TestResults.ps1
@@ -23,8 +23,8 @@ function Reset-GlobalTestResults {
 
 function Write-TestReport {
     $results = $Global:TestResults
-    Write-Host Tests completed in (Get-HumanTime $results.TotalTime)
-    Write-Host Passed: $($results.TestCount - $results.FailedTestsCount) Failed: $($results.FailedTestsCount)
+    Write-Host "Tests completed in $(Get-HumanTime $results.TotalTime)"
+    Write-Host "Passed: $($results.TestCount - $results.FailedTestsCount) Failed: $($results.FailedTestsCount)"
 }
 
 function Get-HumanTime($seconds) {
@@ -126,7 +126,7 @@ function Get-RunTimeEnvironment() {
 
 
 function Exit-WithCode {
-    $failedTestCount = $Global:TestResults.FailedTests.Length
+    $failedTestCount = $Global:TestResults.FailedTestsCount
     $host.SetShouldExit($failedTestCount)
 }
 
diff --git a/Pester.psm1 b/Pester.psm1
@@ -2,7 +2,7 @@ Resolve-Path $PSScriptRoot\Functions\*.ps1 |
     ? { -not ($_.ProviderPath.Contains(".Tests.")) } |
     % { . $_.ProviderPath }
 
-function Invoke-Pester($relative_path = ".", [switch] $EnableExit, $OutputXml = $null) {
+function Invoke-Pester($relative_path = ".", $test_name = $null, [switch] $EnableExit) {
     Reset-GlobalTestResults
     . "$PSScriptRoot\ObjectAdaptations\PesterFailure.ps1"
     Update-TypeData -pre "$PSScriptRoot\ObjectAdaptations\types.ps1xml" -ErrorAction SilentlyContinue

diff --git a/bin/pester.bat b/bin/pester.bat
@@ -8,7 +8,7 @@ if '%1'=='/help' goto usage
 if '%1'=='help' goto usage
 if '%1'=='new-fixture' goto newfixture
 
-@PowerShell -NonInteractive -NoProfile -ExecutionPolicy unrestricted -Command "& Import-Module '%DIR%..\Pester.psm1'; & { Invoke-Pester -OutputXml Test.xml -EnableExit; exit $LastExitCode}"
+@PowerShell -NonInteractive -NoProfile -ExecutionPolicy unrestricted -Command "& Import-Module '%DIR%..\Pester.psm1'; & { Invoke-Pester -OutputXml Test.xml -EnableExit %*}"
 
 goto finish
 :newfixture