Refactor PSScriptAnalyzer tests to simplify skip logic and update custom settings structure

Author: MariusStorhaug

scripts/tests/PSScriptAnalyzer/PSScriptAnalyzer.Tests.ps1

@@ -27,15 +27,12 @@ BeforeDiscovery {
             $skip = $true
         } elseif ($settings.Severity -and $ruleObject.Severity -notin $settings.Severity) {
             $skip = $true
-        } elseif ($settings.SourceType -and $ruleObject.SourceType -notin $settings.SourceType) {
-            $skip = $true
-        } elseif ($settings.SourceName -and $ruleObject.SourceName -notin $settings.SourceName) {
-            $skip = $true
         } elseif ($settings.Rules -and $settings.Rules.ContainsKey($ruleObject.RuleName) -and -not $settings.Rules[$ruleObject.RuleName].Enabled) {
             $skip = $true
         } else {
             $skip = $false
         }
+
         $rules.Add(
             [ordered]@{
                 RuleName    = $ruleObject.RuleName

tests/srcTestRepo/tests/Custom.Settings.psd1

@@ -1,5 +1,5 @@
 @{
-    Rules         = @{
+    Rules               = @{
         PSAlignAssignmentStatement         = @{
             Enable         = $true
             CheckHashtable = $true
@@ -49,24 +49,19 @@
             IgnoreAssignmentOperatorInsideHashTable = $true
         }
     }
-    ExcludeRules  = @(
+    ExcludeRules        = @(
         'PSUseConsistentWhitespace'
     )
-    IncludedRules = @(
+    IncludeRules        = @(
         'PSAvoidSemicolonsAsLineTerminators'
         'PSPlaceCloseBrace'
         'PSPlaceOpenBrace'
         'PSProvideCommentHelp'
         'PSUseConsistentIndentation'
     )
-    Severity      = @(
+    IncludeDefaultRules = $true
+    Severity            = @(
         'Error'
         'Warning'
     )
-    SourceType    = @(
-        'Builtin'
-    )
-    SourceName    = @(
-        'PS'
-    )
 }