Testing improvemetns

Author: PhysShell

.github/workflows/ci.yml

@@ -47,4 +47,4 @@ jobs:
         shell: pwsh
         run: |
           $exe = '${{ matrix.ps_exe }}'
-          & $exe -NoProfile -File .\tools\ci.ps1
+          & $exe -NoProfile -File .\tools\ci.ps1 -CurrentShellOnly

.github/workflows/publish.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Run Lint and Tests
         shell: pwsh
         run: |
-          .\tools\ci.ps1
+          .\tools\ci.ps1 -CurrentShellOnly
 
       - name: Validate Module Version Against Tag
         if: startsWith(github.ref, 'refs/tags/v')

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project are documented in this file.
 
 The format is based on Keep a Changelog and the project uses Semantic Versioning.
 
+## [0.1.2] - 2026-02-19
+
+### Added
+
+- Local multi-shell test execution (`powershell` + `pwsh`) in `tools/test.ps1` with clear missing-shell errors.
+
+### Fixed
+
+- Stabilized long-option completion integration tests in Windows PowerShell 5.1 (`gsw`/`gco`).
+
+
 ## [0.1.1] - 2026-02-19
 
 ### Added

README.md

@@ -249,6 +249,9 @@ Run both lint and tests:
 .\tools\ci.ps1
 ```
 
+By default, local test runs execute in both `powershell` (Windows PowerShell 5.1) and `pwsh` (PowerShell 7+).  
+If one of these shells is missing, the script fails with a clear error.
+
 Run only lint:
 
 ```powershell
@@ -261,6 +264,12 @@ Run only tests:
 .\tools\ci.ps1 -TestOnly
 ```
 
+Run checks only in the current shell (used by CI matrix):
+
+```powershell
+.\tools\ci.ps1 -CurrentShellOnly
+```
+
 ## Commit hooks
 
 Install local git hooks:

tests/git-aliases-extra.Integration.Tests.ps1

@@ -67,6 +67,36 @@ BeforeAll {
         throw "Could not find blob hash prefix '$Prefix' within $MaxAttempts attempts."
     }
 
+    function Script:Get-TabCompletionResult {
+        [CmdletBinding()]
+        param(
+            [Parameter(Mandatory = $true)]
+            [string]$Line
+        )
+
+        TabExpansion2 -inputScript $Line -cursorColumn $Line.Length
+    }
+
+    function Script:Get-LongOptionCompletionResult {
+        [CmdletBinding()]
+        param(
+            [Parameter(Mandatory = $true)]
+            [string]$CommandName,
+            [Parameter(Mandatory = $true)]
+            [string]$FallbackPrefix
+        )
+
+        # In Windows PowerShell 5.1, a bare "--" token is parsed in a way that
+        # often bypasses argument completers entirely. Probe with "--" first,
+        # then retry with a concrete prefix to validate long-option completion.
+        $result = Get-TabCompletionResult -Line ("{0} --" -f $CommandName)
+        if ($result.CompletionMatches.Count -gt 0 -or $PSVersionTable.PSVersion.Major -ge 6) {
+            return $result
+        }
+
+        return (Get-TabCompletionResult -Line ("{0} {1}" -f $CommandName, $FallbackPrefix))
+    }
+
     [string]$script:RepoRoot = Resolve-Path -LiteralPath (Join-Path $PSScriptRoot '..') |
         Select-Object -ExpandProperty Path -First 1
     $script:ModuleManifest = Join-Path $script:RepoRoot 'git-aliases-extra.psd1'
@@ -301,8 +331,7 @@ Describe 'gsw integration' {
     It 'completes long options for gsw alias' -Skip:(-not (Get-Command git -ErrorAction SilentlyContinue)) {
         Push-Location $script:RepoRoot
         try {
-            $line = 'gsw --'
-            $result = TabExpansion2 -inputScript $line -cursorColumn $line.Length
+            $result = Get-LongOptionCompletionResult -CommandName 'gsw' -FallbackPrefix '--t'
         } finally {
             Pop-Location
         }
@@ -315,8 +344,7 @@ Describe 'gsw integration' {
     It 'completes long options for gco alias from git-aliases module' -Skip:(-not (Get-Command git -ErrorAction SilentlyContinue) -or -not $script:HasGcoAlias) {
         Push-Location $script:RepoRoot
         try {
-            $line = 'gco --'
-            $result = TabExpansion2 -inputScript $line -cursorColumn $line.Length
+            $result = Get-LongOptionCompletionResult -CommandName 'gco' -FallbackPrefix '--d'
         } finally {
             Pop-Location
         }

tools/ci.ps1

@@ -1,7 +1,8 @@
 [CmdletBinding()]
 param(
     [switch]$LintOnly,
-    [switch]$TestOnly
+    [switch]$TestOnly,
+    [switch]$CurrentShellOnly
 )
 
 $ErrorActionPreference = 'Stop'
@@ -15,7 +16,11 @@ if (-not $TestOnly) {
 }
 
 if (-not $LintOnly) {
-    & (Join-Path $root 'tools\test.ps1')
+    $testArgs = @{}
+    if ($CurrentShellOnly) {
+        $testArgs.CurrentShellOnly = $true
+    }
+    & (Join-Path $root 'tools\test.ps1') @testArgs
 }
 
 Write-Host 'CI checks completed.'

tools/test.ps1

@@ -1,16 +1,25 @@
 [CmdletBinding()]
 param(
-    [string]$TestsPath = ''
+    [string]$TestsPath = '',
+    [switch]$CurrentShellOnly,
+    [string[]]$Shells = @('powershell', 'pwsh')
 )
 
 $ErrorActionPreference = 'Stop'
 Set-StrictMode -Version Latest
 
-if (-not (Get-Module -ListAvailable -Name Pester)) {
-    throw "Pester is not installed. Run: Install-Module Pester -Scope CurrentUser -Force"
+function Get-UserModulePath {
+    if ($PSVersionTable.PSEdition -eq 'Desktop') {
+        return (Join-Path $HOME 'Documents\WindowsPowerShell\Modules')
+    } else {
+        return (Join-Path $HOME 'Documents\PowerShell\Modules')
+    }
 }
 
-Import-Module Pester -MinimumVersion 5.0 -ErrorAction Stop
+$userModules = Get-UserModulePath
+if ($env:PSModulePath -notlike "*$userModules*") {
+    $env:PSModulePath = "$userModules;$env:PSModulePath"
+}
 
 if (-not $TestsPath) {
     $TestsPath = Resolve-Path -LiteralPath (Join-Path $PSScriptRoot '..\tests') |
@@ -21,9 +30,46 @@ if (-not (Test-Path -LiteralPath $TestsPath)) {
     throw "Tests folder not found: $TestsPath"
 }
 
-$result = Invoke-Pester -Path $TestsPath -CI -PassThru
+$runAllShells = -not $CurrentShellOnly
+if ($env:GITHUB_ACTIONS -eq 'true' -or $env:CI -eq 'true') {
+    $runAllShells = $false
+}
+
+if ($runAllShells) {
+    $uniqueShells = @($Shells | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique)
+    if ($uniqueShells.Count -eq 0) {
+        throw 'No shells specified for test execution.'
+    }
+
+    $missingShells = @($uniqueShells | Where-Object { -not (Get-Command $_ -ErrorAction SilentlyContinue) })
+    if ($missingShells.Count -gt 0) {
+        throw ("Missing required shell executable(s): {0}. Install both Windows PowerShell 5.1 ('powershell') and PowerShell 7+ ('pwsh'), or run -CurrentShellOnly." -f ($missingShells -join ', '))
+    }
+
+    foreach ($shellName in $uniqueShells) {
+        Write-Host ("Running tests in {0}..." -f $shellName)
+        & $shellName -NoProfile -ExecutionPolicy Bypass -File $PSCommandPath -TestsPath $TestsPath -CurrentShellOnly
+        if ($LASTEXITCODE -ne 0) {
+            throw ("Tests failed in shell: {0}" -f $shellName)
+        }
+    }
+
+    Write-Host ("Pester: all tests passed in shells: {0}." -f ($uniqueShells -join ', '))
+    return
+}
+
+if (-not (Get-Module -ListAvailable -Name Pester)) {
+    throw "Pester is not installed in this shell. Run: Install-Module Pester -Scope CurrentUser -Force"
+}
+
+Import-Module Pester -MinimumVersion 5.0 -ErrorAction Stop
+
+$result = Invoke-Pester -Path $TestsPath -CI -PassThru -ErrorAction Stop
+if ($null -eq $result) {
+    throw 'Invoke-Pester returned no result.'
+}
 if ($result.FailedCount -gt 0) {
     throw "Pester failed: $($result.FailedCount) test(s) failed."
 }
 
-Write-Host "Pester: all tests passed ($($result.PassedCount) passed)."
+Write-Host ("Pester: all tests passed ({0} passed) in {1} {2}." -f $result.PassedCount, $PSVersionTable.PSEdition, $PSVersionTable.PSVersion)