From 9db6fc63bd444acb9adc82bf0642f67c018bd6a2 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Thu, 25 Jun 2020 07:56:52 -0400 Subject: [PATCH 1/2] Created object first, then updated settings. --- Extension/PesterTask/PesterV10/Pester.ps1 | 38 ++++++++++------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/Extension/PesterTask/PesterV10/Pester.ps1 b/Extension/PesterTask/PesterV10/Pester.ps1 index efc5155..1ff9d16 100644 --- a/Extension/PesterTask/PesterV10/Pester.ps1 +++ b/Extension/PesterTask/PesterV10/Pester.ps1 @@ -86,19 +86,18 @@ if ($PSBoundParameters.ContainsKey('additionalModulePath')) { Write-Host "Adding additional module path [$additionalModulePath] to `$env:PSModulePath" $env:PSModulePath = $additionalModulePath + ';' + $env:PSModulePath } +$PesterConfig = [PesterConfiguration]::Default -$PesterConfig = @{ - - Run = @{ - Path = $TestFolder - PassThru = $true - } - TestResult = @{ - Enabled = $true - OutputFormat = 'NUnit2.5' - OutputPath = $resultsFile - } +$PesterConfig.run = @{ + Path = $TestFolder + PassThru = $true } +$PesterConfig.TestResult = @{ + Enabled = $true + OutputFormat = 'NUnit2.5' + OutputPath = $resultsFile +} + $Filter = @{} if ($Tag) { @@ -110,30 +109,27 @@ if ($ExcludeTag) { $Filter.Add('ExcludeTag', $ExcludeTag) } -$PesterConfig['Filter'] = $Filter +$PesterConfig.Filter = $Filter -$CodeCoverage = @{} if ($CodeCoverageOutputFile) { - $CodeCoverage['Enabled'] = $True - $CodeCoverage['OutputFormat'] = "JaCoCo" + $PesterConfig.CodeCoverage.Enabled = $True + $PesterConfig.CodeCoverage.OutputFormat = "JaCoCo" if (-not $PSBoundParameters.ContainsKey('CodeCoverageFolder')) { $CodeCoverageFolder = $TestFolder } $Files = Get-ChildItem -Path $CodeCoverageFolder -include *.ps1, *.psm1 -Exclude *.Tests.ps1 -Recurse | - Select-object -ExpandProperty Fullname + Select-object -ExpandProperty Fullname if ($Files) { - $CodeCoverage.Add('Path', $Files) - $CodeCoverage.Add('OutputPath', $CodeCoverageOutputFile) + $PesterConfig.CodeCoverage.Path = $Files + $PesterConfig.CodeCoverage.OutputPath = $CodeCoverageOutputFile } - else { + else {` Write-Warning -Message "No PowerShell files found under [$CodeCoverageFolder] to analyse for code coverage." } } -$PesterConfig['CodeCoverage'] = $CodeCoverage - if (-not([String]::IsNullOrWhiteSpace($ScriptBlock))) { $ScriptBlockObject = [ScriptBlock]::Create($ScriptBlock) From 4bb3e01c86b6d406d13a89081fa146323379fa27 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Sat, 27 Jun 2020 08:38:34 -0400 Subject: [PATCH 2/2] fixed random tick and formating issue. --- Extension/PesterTask/PesterV10/Pester.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Extension/PesterTask/PesterV10/Pester.ps1 b/Extension/PesterTask/PesterV10/Pester.ps1 index 1ff9d16..4ad5f9c 100644 --- a/Extension/PesterTask/PesterV10/Pester.ps1 +++ b/Extension/PesterTask/PesterV10/Pester.ps1 @@ -119,13 +119,13 @@ if ($CodeCoverageOutputFile) { $CodeCoverageFolder = $TestFolder } $Files = Get-ChildItem -Path $CodeCoverageFolder -include *.ps1, *.psm1 -Exclude *.Tests.ps1 -Recurse | - Select-object -ExpandProperty Fullname + Select-object -ExpandProperty Fullname if ($Files) { $PesterConfig.CodeCoverage.Path = $Files $PesterConfig.CodeCoverage.OutputPath = $CodeCoverageOutputFile } - else {` + else { Write-Warning -Message "No PowerShell files found under [$CodeCoverageFolder] to analyse for code coverage." } }