Fix failing tests for PSv4/PSv3

Author: Kapil Borle

Tests/Engine/GetScriptAnalyzerRule.tests.ps1

@@ -62,7 +62,7 @@ Describe "Test Name parameters" {
         It "get Rules with no parameters supplied" {
 			$defaultRules = Get-ScriptAnalyzerRule
             $expectedNumRules = 45
-            if ((Test-PSEditionCoreClr) -or (Test-PSVersionV3))
+            if ((Test-PSEditionCoreClr) -or (Test-PSVersionV3) -or (Test-PSVersionV4))
             {
                 # for PSv3 PSAvoidGlobalAliases is not shipped because
                 # it uses StaticParameterBinder.BindCommand which is

Tests/Rules/AvoidGlobalAliases.tests.ps1

@@ -1,32 +1,27 @@
 $directory = Split-Path -Parent $MyInvocation.MyCommand.Path
 $testRootDirectory = Split-Path -Parent $directory
 Import-Module (Join-Path $testRootDirectory 'PSScriptAnalyzerTestHelper.psm1')
-if ((Test-PSVersionV3))
-{
-    return
-}
-
 Import-Module PSScriptAnalyzer
 
 $AvoidGlobalAliasesError = "Avoid creating aliases with a Global scope."
 $violationName = "PSAvoidGlobalAliases"
 $violations = Invoke-ScriptAnalyzer $directory\AvoidGlobalAliases.psm1 | Where-Object {$_.RuleName -eq $violationName}
 $noViolations = Invoke-ScriptAnalyzer $directory\AvoidGlobalAliasesNoViolations.ps1 | Where-Object {$_.RuleName -eq $violationName}
-
+$IsV3OrV4 = (Test-PSVersionV3) -or (Test-PSVersionV4)
 
 Describe "$violationName " {
     Context "When there are violations" {
-        It "Has 4 avoid global alias violations" {
+        It "Has 4 avoid global alias violations" -Skip:$IsV3OrV4 {
             $violations.Count | Should Be 4
         }
 
-        It "Has the correct description message" {
+        It "Has the correct description message" -Skip:$IsV3OrV4 {
             $violations[0].Message | Should Match $AvoidGlobalAliasesError
         }
     }
 
     Context "When there are no violations" {
-        It "Returns no violations" {
+        It "Returns no violations" -Skip:$IsV3OrV4 {
             $noViolations.Count | Should Be 0
         }
     }

Tests/Rules/PSCredentialType.tests.ps1

@@ -11,7 +11,7 @@ $noViolations = Invoke-ScriptAnalyzer $directory\PSCredentialTypeNoViolations.ps
 Describe "PSCredentialType" {
     Context "When there are violations" {
         $expectedViolations = 1
-        if (Test-PSVersionV3 -or Test-PSVersionV4) {
+        if ((Test-PSVersionV3) -or (Test-PSVersionV4)) {
             $expectedViolations = 2
         }
         It ("has {0} PSCredential type violation" -f $expectedViolations) {

Tests/Rules/UseShouldProcessCorrectly.tests.ps1

@@ -1,9 +1,14 @@
-Import-Module PSScriptAnalyzer
-$violationMessage = "'Verb-Files' has the ShouldProcess attribute but does not call ShouldProcess/ShouldContinue."
+$violationMessage = "'Verb-Files' has the ShouldProcess attribute but does not call ShouldProcess/ShouldContinue."
 $violationName = "PSShouldProcess"
 $directory = Split-Path -Parent $MyInvocation.MyCommand.Path
+$testRootDirectory = Split-Path -Parent $directory
+
+Import-Module (Join-Path $testRootDirectory 'PSScriptAnalyzerTestHelper.psm1')
+Import-Module PSScriptAnalyzer
+
 $violations = Invoke-ScriptAnalyzer $directory\BadCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}
 $noViolations = Invoke-ScriptAnalyzer $directory\GoodCmdlet.ps1 | Where-Object {$_.RuleName -eq $violationName}
+$IsV3OrV4 = (Test-PSVersionV3) -or (Test-PSVersionV4)
 
 Describe "UseShouldProcessCorrectly" {
     Context "When there are violations" {
@@ -172,7 +177,8 @@ function Remove-Foo {
             $violations.Count | Should Be 0
         }
 
-        It "finds no violation when caller declares SupportsShouldProcess and callee is a function with ShouldProcess" {
+        # Install-Module is present by default only on PSv5 and above
+        It "finds no violation when caller declares SupportsShouldProcess and callee is a function with ShouldProcess" -Skip:$IsV3OrV4 {
             $scriptDef = @'
 function Install-Foo {
 [CmdletBinding(SupportsShouldProcess)]
@@ -223,7 +229,8 @@ function Install-ModuleWithDeps {
             $violations.Count | Should Be 0
         }
 
-       It "finds no violation for a function with self reference and implicit call to ShouldProcess" {
+       # Install-Module is present by default only on PSv5 and above
+       It "finds no violation for a function with self reference and implicit call to ShouldProcess" -Skip:$IsV3OrV4 {
             $scriptDef = @'
 function Install-ModuleWithDeps {
 [CmdletBinding(SupportsShouldProcess)]