Merge from upstream

Author: Brandon Olin

CHANGELOG.md

@@ -16,7 +16,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
-- PR25 Discovery Pester 'Describe' block names when the -Name parameter is used (via @GitAMBS)
+- PR25 - Discover Pester 'Describe' block names when the -Name parameter is used (via @GitAMBS)
+- PR29 - Remove Pester 4.0+ warning by using -Show parameter instead of -Quiet. Add -UseBasicParsing parameter to Invoke-WebRequest in tests (via @larssb)
 - Fixed #3 where an error would be generated when using Invoke-OperationValidation with the -TestFilePath parameter
   against a Pester test file with a short path.
 

OperationValidation/Public/Invoke-OperationValidation.ps1

@@ -170,11 +170,12 @@ function Invoke-OperationValidation
 
     BEGIN
     {
-        if ( -not (Get-Module -Name Pester))
+        $pesterMod = Get-Module -Name Pester
+        if ( -not $pesterMod)
         {
             if ( Get-Module -Name Pester -ListAvailable)
             {
-                Import-Module -Name Pester -Verbose:$false
+                $pesterMod = Import-Module -Name Pester -Verbose:$false -PassThru
             }
             else
             {
@@ -259,7 +260,6 @@ function Invoke-OperationValidation
                 }
 
                 # Pester 4.0.0 deprecated the 'Quiet' parameter in favor of 'Show'
-                $pesterMod = Get-Module -Name Pester
                 if ($pesterMod.Version -ge '4.0.0')
                 {
                     if ($IncludePesterOutput)
@@ -323,10 +323,32 @@ function Invoke-OperationValidation
 
         if ($TestFilePath)
         {
+            $pesterParams = @{
+                PassThru = $true
+                Verbose = $false
+            }
+
+            # Pester 4.0.0 deprecated the 'Quiet' parameter in favor of 'Show'
+            if ($pesterMod.Version -ge '4.0.0')
+            {
+                if ($IncludePesterOutput)
+                {
+                    $pesterParams.Show = 'All'
+                }
+                else
+                {
+                    $pesterParams.Show = 'None'
+                }
+            }
+            else
+            {
+                $pesterParams.Quiet = !$IncludePesterOutput
+            }            
+
             foreach($filePath in $TestFilePath) {
                 write-progress -Activity "Invoking tests in $filePath"
                 if ( $PSCmdlet.ShouldProcess($filePath)) {
-                    $testResult = Invoke-Pester $filePath -passthru -quiet:$quiet
+                    $testResult = Invoke-Pester $filePath @pesterParams
                     Add-Member -InputObject $testResult -MemberType NoteProperty -Name Path -Value $filePath
                     Convert-TestResult -Result $testResult
                 }

TestArtifacts/VersionedModule/1.0.0/Diagnostics/Simple/PSGallery.Simple.Tests.ps1

@@ -5,7 +5,7 @@ param(
 
 Describe 'Simple Validation of PSGallery' -Tag 'AAABBBCCC' {
     It 'The PowerShell Gallery should be responsive' {
-        $response = Invoke-WebRequest -Uri $WebsiteUrl
+        $response = Invoke-WebRequest -Uri $WebsiteUrl -UseBasicParsing
         $response.StatusCode | Should Be $StatusCode
     }
 

TestArtifacts/VersionedModule/2.0.0/Diagnostics/Simple/PSGallery.Simple.Tests.ps1

@@ -1,21 +1,21 @@
 Describe 'Simple Validation of PSGallery' -Tag 'AAABBBCCC' {
     It 'The PowerShell Gallery should be responsive' {
-        $response = Invoke-WebRequest -Uri 'https://www.powershellgallery.com'
+        $response = Invoke-WebRequest -Uri 'https://www.powershellgallery.com' -UseBasicParsing
         $response.StatusCode | Should be 200
     }
 }
 
 Describe 'Simple Validation of Microsoft' -Tag 'AAABBBCCC', 'XXXYYYZZZ' {
     It 'Microsoft should be responsive' {
-        $response = Invoke-WebRequest -Uri 'https://www.microsoft.com'
+        $response = Invoke-WebRequest -Uri 'https://www.microsoft.com' -UseBasicParsing
         $response.StatusCode | Should be 200
     }
 }
 
 
 Describe 'Simple Validation of Github' -Tag 'JJJKKKLLL' {
     It 'GitHub should be responsive' {
-        $response = Invoke-WebRequest -Uri 'https://www.github.com'
+        $response = Invoke-WebRequest -Uri 'https://www.github.com' -UseBasicParsing
         $response.StatusCode | Should be 200
     }
 }