Skip to content

Commit 90ed94c

Browse files
🩹 [Patch]: Refactor variable names for clarity in Get-AggregatedStatus tests and improve settings file path handling in Invoke-ScriptAnalyzer
1 parent b013966 commit 90ed94c

2 files changed

Lines changed: 42 additions & 41 deletions

File tree

scripts/main.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $codePath = Resolve-Path -Path $path | Select-Object -ExpandProperty Path
77
$settingsFilePath = $null
88
if (-not [string]::IsNullOrEmpty($env:PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_SettingsFilePath)) {
99
try {
10-
$settingsFilePath = Resolve-Path -Path $env:PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_SettingsFilePath -ErrorAction Stop | Select-Object -ExpandProperty Path
10+
$settingsFilePath = Resolve-Path -Path $env:PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_SettingsFilePath -ErrorAction Stop |
11+
Select-Object -ExpandProperty Path
1112
Write-Information "Using settings file: $settingsFilePath"
1213
} catch {
1314
Write-Warning "Settings file not found at path: $($env:PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_SettingsFilePath). Using default settings."

tests/Get-AggregatedStatus.ps1

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@
2020
}
2121

2222
# Build an array of objects for each job
23-
$ActionTestSrcSourceCodeExpectedOutcome = 'success'
24-
$ActionTestSrcSourceCodeOutcomeResult = $env:ActionTestSrcSourceCodeOutcome -eq $ActionTestSrcSourceCodeExpectedOutcome
25-
$ActionTestSrcSourceCodeExpectedConclusion = 'success'
26-
$ActionTestSrcSourceCodeConclusionResult = $env:ActionTestSrcSourceCodeConclusion -eq $ActionTestSrcSourceCodeExpectedConclusion
23+
$SourceCodeExpectedOutcome = 'success'
24+
$SourceCodeOutcomeResult = $env:SourceCodeOutcome -eq $SourceCodeExpectedOutcome
25+
$SourceCodeExpectedConclusion = 'success'
26+
$SourceCodeConclusionResult = $env:SourceCodeConclusion -eq $SourceCodeExpectedConclusion
2727

28-
$ActionTestSrcCustomExpectedOutcome = 'success'
29-
$ActionTestSrcCustomOutcomeResult = $env:ActionTestSrcCustomOutcome -eq $ActionTestSrcCustomExpectedOutcome
30-
$ActionTestSrcCustomExpectedConclusion = 'success'
31-
$ActionTestSrcCustomConclusionResult = $env:ActionTestSrcCustomConclusion -eq $ActionTestSrcCustomExpectedConclusion
28+
$CustomExpectedOutcome = 'success'
29+
$CustomOutcomeResult = $env:CustomOutcome -eq $CustomExpectedOutcome
30+
$CustomExpectedConclusion = 'success'
31+
$CustomConclusionResult = $env:CustomConclusion -eq $CustomExpectedConclusion
3232

33-
$ActionTestSrcWithManifestExpectedOutcome = 'failure'
34-
$ActionTestSrcWithManifestOutcomeResult = $env:ActionTestSrcWithManifestOutcome -eq $ActionTestSrcWithManifestExpectedOutcome
35-
$ActionTestSrcWithManifestExpectedConclusion = 'success'
36-
$ActionTestSrcWithManifestConclusionResult = $env:ActionTestSrcWithManifestConclusion -eq $ActionTestSrcWithManifestExpectedConclusion
33+
$WithManifestExpectedOutcome = 'failure'
34+
$WithManifestOutcomeResult = $env:WithManifestOutcome -eq $WithManifestExpectedOutcome
35+
$WithManifestExpectedConclusion = 'success'
36+
$WithManifestConclusionResult = $env:WithManifestConclusion -eq $WithManifestExpectedConclusion
3737

38-
$ActionTestSrcWithManifestDefaultExpectedOutcome = 'failure'
39-
$ActionTestSrcWithManifestDefaultOutcomeResult = $env:ActionTestSrcWithManifestDefaultOutcome -eq $ActionTestSrcWithManifestDefaultExpectedOutcome
40-
$ActionTestSrcWithManifestDefaultExpectedConclusion = 'success'
41-
$ActionTestSrcWithManifestDefaultConclusionResult = $env:ActionTestSrcWithManifestDefaultConclusion -eq $ActionTestSrcWithManifestDefaultExpectedConclusion
38+
$WithManifestDefaultExpectedOutcome = 'failure'
39+
$WithManifestDefaultOutcomeResult = $env:WithManifestDefaultOutcome -eq $WithManifestDefaultExpectedOutcome
40+
$WithManifestDefaultExpectedConclusion = 'success'
41+
$WithManifestDefaultConclusionResult = $env:WithManifestDefaultConclusion -eq $WithManifestDefaultExpectedConclusion
4242

4343
$ActionTestOutputsExpectedOutcome = 'success'
4444
$ActionTestOutputsOutcomeResult = $env:ActionTestOutputsOutcome -eq $ActionTestOutputsExpectedOutcome
@@ -48,39 +48,39 @@ $ActionTestOutputsConclusionResult = $env:ActionTestOutputsConclusion -eq $Actio
4848
$jobs = @(
4949
[PSCustomObject]@{
5050
Name = 'Action-Test - [Src-SourceCode]'
51-
Outcome = $env:ActionTestSrcSourceCodeOutcome
52-
ExpectedOutcome = $ActionTestSrcSourceCodeExpectedOutcome
53-
PassedOutcome = $ActionTestSrcSourceCodeOutcomeResult
54-
Conclusion = $env:ActionTestSrcSourceCodeConclusion
55-
ExpectedConclusion = $ActionTestSrcSourceCodeExpectedConclusion
56-
PassedConclusion = $ActionTestSrcSourceCodeConclusionResult
51+
Outcome = $env:SourceCodeOutcome
52+
ExpectedOutcome = $SourceCodeExpectedOutcome
53+
PassedOutcome = $SourceCodeOutcomeResult
54+
Conclusion = $env:SourceCodeConclusion
55+
ExpectedConclusion = $SourceCodeExpectedConclusion
56+
PassedConclusion = $SourceCodeConclusionResult
5757
},
5858
[PSCustomObject]@{
5959
Name = 'Action-Test - [Src-Custom]'
60-
Outcome = $env:ActionTestSrcCustomOutcome
61-
ExpectedOutcome = $ActionTestSrcCustomExpectedOutcome
62-
PassedOutcome = $ActionTestSrcCustomOutcomeResult
63-
Conclusion = $env:ActionTestSrcCustomConclusion
64-
ExpectedConclusion = $ActionTestSrcCustomExpectedConclusion
65-
PassedConclusion = $ActionTestSrcCustomConclusionResult
60+
Outcome = $env:CustomOutcome
61+
ExpectedOutcome = $CustomExpectedOutcome
62+
PassedOutcome = $CustomOutcomeResult
63+
Conclusion = $env:CustomConclusion
64+
ExpectedConclusion = $CustomExpectedConclusion
65+
PassedConclusion = $CustomConclusionResult
6666
},
6767
[PSCustomObject]@{
6868
Name = 'Action-Test - [Src-WithManifest]'
69-
Outcome = $env:ActionTestSrcWithManifestOutcome
70-
ExpectedOutcome = $ActionTestSrcWithManifestExpectedOutcome
71-
PassedOutcome = $ActionTestSrcWithManifestOutcomeResult
72-
Conclusion = $env:ActionTestSrcWithManifestConclusion
73-
ExpectedConclusion = $ActionTestSrcWithManifestExpectedConclusion
74-
PassedConclusion = $ActionTestSrcWithManifestConclusionResult
69+
Outcome = $env:WithManifestOutcome
70+
ExpectedOutcome = $WithManifestExpectedOutcome
71+
PassedOutcome = $WithManifestOutcomeResult
72+
Conclusion = $env:WithManifestConclusion
73+
ExpectedConclusion = $WithManifestExpectedConclusion
74+
PassedConclusion = $WithManifestConclusionResult
7575
},
7676
[PSCustomObject]@{
7777
Name = 'Action-Test - [Src-WithManifest-Default]'
78-
Outcome = $env:ActionTestSrcWithManifestDefaultOutcome
79-
ExpectedOutcome = $ActionTestSrcWithManifestDefaultExpectedOutcome
80-
PassedOutcome = $ActionTestSrcWithManifestDefaultOutcomeResult
81-
Conclusion = $env:ActionTestSrcWithManifestDefaultConclusion
82-
ExpectedConclusion = $ActionTestSrcWithManifestDefaultExpectedConclusion
83-
PassedConclusion = $ActionTestSrcWithManifestDefaultConclusionResult
78+
Outcome = $env:WithManifestDefaultOutcome
79+
ExpectedOutcome = $WithManifestDefaultExpectedOutcome
80+
PassedOutcome = $WithManifestDefaultOutcomeResult
81+
Conclusion = $env:WithManifestDefaultConclusion
82+
ExpectedConclusion = $WithManifestDefaultExpectedConclusion
83+
PassedConclusion = $WithManifestDefaultConclusionResult
8484
},
8585
[PSCustomObject]@{
8686
Name = 'Action-Test - [outputs]'

0 commit comments

Comments
 (0)