Skip to content

Commit 41751e3

Browse files
Fixed conditional test results
1 parent fd03c00 commit 41751e3

File tree

1 file changed

+39
-33
lines changed

1 file changed

+39
-33
lines changed

templates/PSFTests/pester.ps1

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,50 +27,56 @@ $totalRun = 0
2727
$testresults = @()
2828

2929
#region Run General Tests
30-
Write-PSFMessage -Level Important -Message "Modules imported, proceeding with general tests"
31-
foreach ($file in (Get-ChildItem "$PSScriptRoot\general" -Filter "*.Tests.ps1"))
30+
if ($TestGeneral)
3231
{
33-
Write-PSFMessage -Level Significant -Message " Executing <c='em'>$($file.Name)</c>"
34-
þ!testresults!þ
35-
foreach ($result in $results)
32+
Write-PSFMessage -Level Important -Message "Modules imported, proceeding with general tests"
33+
foreach ($file in (Get-ChildItem "$PSScriptRoot\general" -Filter "*.Tests.ps1"))
3634
{
37-
$totalRun += $result.TotalCount
38-
$totalFailed += $result.FailedCount
39-
$result.TestResult | Where-Object { -not $_.Passed } | ForEach-Object {
40-
$name = $_.Name
41-
$testresults += [pscustomobject]@{
42-
Describe = $_.Describe
43-
Context = $_.Context
44-
Name = "It $name"
45-
Result = $_.Result
46-
Message = $_.FailureMessage
35+
Write-PSFMessage -Level Significant -Message " Executing <c='em'>$($file.Name)</c>"
36+
þ!testresults!þ
37+
foreach ($result in $results)
38+
{
39+
$totalRun += $result.TotalCount
40+
$totalFailed += $result.FailedCount
41+
$result.TestResult | Where-Object { -not $_.Passed } | ForEach-Object {
42+
$name = $_.Name
43+
$testresults += [pscustomobject]@{
44+
Describe = $_.Describe
45+
Context = $_.Context
46+
Name = "It $name"
47+
Result = $_.Result
48+
Message = $_.FailureMessage
49+
}
4750
}
4851
}
4952
}
5053
}
5154
#endregion Run General Tests
5255

5356
#region Test Commands
54-
Write-PSFMessage -Level Important -Message "Proceeding with individual tests"
55-
foreach ($file in (Get-ChildItem "$PSScriptRoot\functions" -Recurse -File -Filter "*Tests.ps1"))
57+
if ($TestFunctions)
5658
{
57-
if ($file.Name -notlike $Include) { continue }
58-
if ($file.Name -like $Exclude) { continue }
59-
60-
Write-PSFMessage -Level Significant -Message " Executing $($file.Name)"
61-
þ!testresults!þ
62-
foreach ($result in $results)
59+
Write-PSFMessage -Level Important -Message "Proceeding with individual tests"
60+
foreach ($file in (Get-ChildItem "$PSScriptRoot\functions" -Recurse -File -Filter "*Tests.ps1"))
6361
{
64-
$totalRun += $result.TotalCount
65-
$totalFailed += $result.FailedCount
66-
$result.TestResult | Where-Object { -not $_.Passed } | ForEach-Object {
67-
$name = $_.Name
68-
$testresults += [pscustomobject]@{
69-
Describe = $_.Describe
70-
Context = $_.Context
71-
Name = "It $name"
72-
Result = $_.Result
73-
Message = $_.FailureMessage
62+
if ($file.Name -notlike $Include) { continue }
63+
if ($file.Name -like $Exclude) { continue }
64+
65+
Write-PSFMessage -Level Significant -Message " Executing $($file.Name)"
66+
þ!testresults!þ
67+
foreach ($result in $results)
68+
{
69+
$totalRun += $result.TotalCount
70+
$totalFailed += $result.FailedCount
71+
$result.TestResult | Where-Object { -not $_.Passed } | ForEach-Object {
72+
$name = $_.Name
73+
$testresults += [pscustomobject]@{
74+
Describe = $_.Describe
75+
Context = $_.Context
76+
Name = "It $name"
77+
Result = $_.Result
78+
Message = $_.FailureMessage
79+
}
7480
}
7581
}
7682
}

0 commit comments

Comments
 (0)