V4

CI/CI.ps1

@@ -1,69 +1,99 @@
 param (
-    [string[]]$BrowserList = @('Chrome', 'Firefox')
+    [String]$ModulePath,
+    [string[]]$BrowserList = @('Chrome', 'Firefox'),
+    [Switch]$UseDebugVersion
 )
+
+if ([String]::IsNullOrEmpty($ModulePath)) { $ModulePath = $pwd.path.Replace('\', '/') }
+$env:ModulePath = $ModulePath
+Write-Host "ModulePath: $ModulePath" 
+Write-Host "BrowserList: $($BrowserList -join ',')" 
+$Global:BrowserList = $BrowserList
 #Get the OS/PS version info for later. On Linux run headless On windows and PS 6 (but not 7)  add WindowsPowershell to the module path.
 $Platform = ([environment]::OSVersion.Platform).ToString() + ' PS' + $PSVersionTable.PSVersion.Major
-if ($Platform -notlike 'win*') { $env:AlwaysHeadless = $true }
+if ($Platform -notlike 'win*') { $Global:HeadlessOnly = $true }
 if ($Platform -like 'win*6') {
     $env:PSModulePath -split ';' | Where-Object { $_ -match "\w:\\Prog.*PowerShell\\modules" } | ForEach-Object {
         $env:PSModulePath = ($_ -replace "PowerShell", "WindowsPowerShell") + ";" + $env:PSModulePath
     }
 }
 
+
+
 #Make sure we have the modules we need
-Import-Module .\Output\Selenium\Selenium.psd1 -Force -ErrorAction Stop
-$checkImportExcel = Get-Module -ListAvailable ImportExcel
-if (-not ($checkImportExcel)) {
-    Write-Verbose -Verbose 'Installing ImportExcel'
-    Install-Module ImportExcel -Force -SkipPublisherCheck
+$ModulePathSuffix = 'Output/Selenium/'
+if ($UseDebugVersion) { $ModulePathSuffix = ''; Write-Host 'Debug version will be used' -ForegroundColor Yellow }
+Import-Module "$ModulePath/$($ModulePathSuffix)Selenium.psd1" -Force -ErrorAction Stop
+
+# $checkImportExcel = Get-Module -ListAvailable ImportExcel
+# if (-not ($checkImportExcel)) {
+#     Write-Verbose -Verbose 'Installing ImportExcel'
+#     Install-Module ImportExcel -Force -SkipPublisherCheck
+# }
+# else { $checkImportExcel | Out-Host }
+# $PesterLock = @{MinimumVersion = '4.10.0.0' ; MaximumVersion = '4.99.0.0' }
+# $checkPester = Get-Module -ListAvailable Pester | Where-Object { $_.version.major -ge 4 -and $_.version.minor -ge 4 }
+# if (-not $checkPester) {
+#     Write-Verbose -Verbose 'Installing Pester'
+#     Install-Module Pester -Force -SkipPublisherCheck  @PesterLock
+# }
+# else { $checkPester | Out-Host }
+
+#Import-Module Pester -RequiredVersion 4.10.1
+#Import-Module ImportExcel -RequiredVersion 7.1.1
+
+if (Test-path "$ModulePath/Modules") {
+    Import-Module "$ModulePath/Modules/Pester/5.0.3/Pester.psd1"
+    Import-Module "$ModulePath/Modules/ImportExcel/7.1.1/ImportExcel.psd1"
 }
-else { $checkImportExcel | Out-Host }
-$checkPester = Get-Module -ListAvailable Pester | Where-Object { $_.version.major -ge 4 -and $_.version.minor -ge 4 }
-if (-not $checkPester) {
-    Write-Verbose -Verbose 'Installing Pester'
-    Install-Module Pester -Force -SkipPublisherCheck
+else {
+    Import-Module -Name Pester -RequiredVersion 5.0.3
+    Import-Module -Name ImportExcel -RequiredVersion 7.1.1
 }
-else { $checkPester | Out-Host }
 
-#Run the test and results export to an Excel file for current OS - Test picks up the selected browser from an environment variable.
+
+Write-verbose -Verbose "Pester $((Get-Module -Name Pester).Version.ToString()) loaded"
+Write-verbose -Verbose "ImportExcel $((Get-Module -Name ImportExcel).Version.ToString()) loaded"
+
+# #Run the test and results export to an Excel file for current OS - Test picks up the selected browser from an environment variable.
 $RunParameters = @{
     XLFile = '{0}/results/Results-{1}.xlsx' -f $env:BUILD_ARTIFACTSTAGINGDIRECTORY, [environment]::OSVersion.Platform.ToString()
-    Script = Join-Path -Path (Join-Path $pwd 'Examples') -ChildPath 'Combined.tests.ps1'
+    Path   = "$ModulePath/Examples/Combined.tests.ps1"
 }
 foreach ( $b   in $BrowserList) {
-    $env:DefaultBrowser = $b
+    $Global:DefaultBrowser = $b
     $RunParameters['OutputFile'] = Join-Path $pwd "TestResults-$platform$b.xml"
     $RunParameters['WorkSheetName'] = "$B $Platform"
     $RunParameters | Out-Host
     & "$PSScriptRoot\Pester-To-XLSx.ps1"  @RunParameters
 }
 
 #Merge the results sheets into a sheet named 'combined'.
-$excel = Open-ExcelPackage $RunParameters.XLFile
-$wslist = $excel.Workbook.Worksheets.name
-Close-ExcelPackage -NoSave $excel
-Merge-MultipleSheets -path  $RunParameters.XLFile -WorksheetName $wslist -OutputSheetName combined -OutputFile $RunParameters.XLFile -HideRowNumbers -Property name, result
+# $excel = Open-ExcelPackage $RunParameters.XLFile
+# $wslist = $excel.Workbook.Worksheets.name
+# Close-ExcelPackage -NoSave $excel
+# Merge-MultipleSheets -path  $RunParameters.XLFile -WorksheetName $wslist -OutputSheetName combined -OutputFile $RunParameters.XLFile -HideRowNumbers -Property name, result
 
-#Hide everything on 'combined' except test name, results for each browser, and test group, Set column widths, tweak titles, apply conditional formatting.
-$excel = Open-ExcelPackage $RunParameters.XLFile
-$ws = $excel.combined
-2..$ws.Dimension.end.Column | ForEach-Object {
-    if ($ws.Cells[1, $_].value -notmatch '^Name|Result$|PS\dGroup$') {
-        Set-ExcelColumn -Worksheet $ws -Column $_ -Hid
-    }
-    elseif ($ws.Cells[1, $_].value -match 'Result$' ) {
-        Set-ExcelColumn -Worksheet $ws -Column $_ -Width 17
-        Set-ExcelRange $ws.Cells[1, $_] -WrapText
-    }
-    if ($ws.cells[1, $_].value -match 'PS\dGroup$') {
-        Set-ExcelRange $ws.Cells[1, $_] -WrapText -Value 'Group'
-    }
-    if ($ws.cells[1, $_].value -match '^Name|PS\dGroup$' -and ($ws.Column($_).Width -gt 80)) {
-        $ws.Column($_).Width = 80
-    }
-}
-Set-ExcelRow -Worksheet $ws -Height 28.5
-$cfRange = [OfficeOpenXml.ExcelAddress]::new(2, 3, $ws.Dimension.end.Row, (3 * $wslist.count - 2)).Address
-Add-ConditionalFormatting -WorkSheet $ws -range $cfRange -RuleType ContainsText -ConditionValue "Failure" -BackgroundPattern None -ForegroundColor Red   -Bold
-Add-ConditionalFormatting -WorkSheet $ws -range $cfRange -RuleType ContainsText -ConditionValue "Success" -BackgroundPattern None -ForeGroundColor Green
-Close-ExcelPackage $excel
+# #Hide everything on 'combined' except test name, results for each browser, and test group, Set column widths, tweak titles, apply conditional formatting.
+# $excel = Open-ExcelPackage $RunParameters.XLFile
+# $ws = $excel.combined
+# 2..$ws.Dimension.end.Column | ForEach-Object {
+#     if ($ws.Cells[1, $_].value -notmatch '^Name|Result$|PS\dGroup$') {
+#         Set-ExcelColumn -Worksheet $ws -Column $_ -Hid
+#     }
+#     elseif ($ws.Cells[1, $_].value -match 'Result$' ) {
+#         Set-ExcelColumn -Worksheet $ws -Column $_ -Width 17
+#         Set-ExcelRange $ws.Cells[1, $_] -WrapText
+#     }
+#     if ($ws.cells[1, $_].value -match 'PS\dGroup$') {
+#         Set-ExcelRange $ws.Cells[1, $_] -WrapText -Value 'Group'
+#     }
+#     if ($ws.cells[1, $_].value -match '^Name|PS\dGroup$' -and ($ws.Column($_).Width -gt 80)) {
+#         $ws.Column($_).Width = 80
+#     }
+# }
+# Set-ExcelRow -Worksheet $ws -Height 28.5
+# $cfRange = [OfficeOpenXml.ExcelAddress]::new(2, 3, $ws.Dimension.end.Row, (3 * $wslist.count - 2)).Address
+# Add-ConditionalFormatting -WorkSheet $ws -range $cfRange -RuleType ContainsText -ConditionValue "Failure" -BackgroundPattern None -ForegroundColor Red   -Bold
+# Add-ConditionalFormatting -WorkSheet $ws -range $cfRange -RuleType ContainsText -ConditionValue "Success" -BackgroundPattern None -ForeGroundColor Green
+# Close-ExcelPackage $excel

CI/Pester-To-XLSx.ps1

@@ -1,66 +1,64 @@
-[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSPossibleIncorrectComparisonWithNull','',Justification='Intentional use to select non null array items')]
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSPossibleIncorrectComparisonWithNull', '', Justification = 'Intentional use to select non null array items')]
 [CmdletBinding(DefaultParameterSetName = 'Default')]
 param(
-    [Parameter(Position=0)]
-    [string]$XLFile,
+  [Parameter(Position = 0)]
+  [string]$XLFile,
 
-    [Parameter(ParameterSetName='Default',Position=1)]
-    [Alias('Path', 'relative_path')]
-    [object[]]$Script = '.',
+  [Parameter(ParameterSetName = 'Default', Position = 1)]
+  [String]$Path = '.',
 
-    [Parameter(ParameterSetName='Existing',Mandatory=$true)]
-    [switch]
-    $UseExisting,
+  [Parameter(ParameterSetName = 'Existing', Mandatory = $true)]
+  [switch]
+  $UseExisting,
 
-    [Parameter(ParameterSetName='Default', Position=2)]
-    [Parameter(ParameterSetName='Existing',Position=2, Mandatory=$true)]
-    [string]$OutputFile,
+  [Parameter(ParameterSetName = 'Default', Position = 2)]
+  [Parameter(ParameterSetName = 'Existing', Position = 2, Mandatory = $true)]
+  [string]$OutputFile,
 
-    [Parameter(ParameterSetName='Default')]
-    [Alias("Name")]
-    [string[]]$TestName,
+  [Parameter(ParameterSetName = 'Default')]
+  [Alias("Name")]
+  [string[]]$TestName,
 
-    [Parameter(ParameterSetName='Default')]
-    [switch]$EnableExit,
+  [Parameter(ParameterSetName = 'Default')]
+  [switch]$EnableExit,
 
-    [Parameter(ParameterSetName='Default')]
-    [Alias('Tags')]
-    [string[]]$Tag,
-    [string[]]$ExcludeTag,
+  [Parameter(ParameterSetName = 'Default')]
+  [Alias('Tags')]
+  [string[]]$Tag,
+  [string[]]$ExcludeTag,
 
-    [Parameter(ParameterSetName='Default')]
-    [switch]$Strict,
+  [Parameter(ParameterSetName = 'Default')]
+  [switch]$Strict,
 
-    [string]$WorkSheetName = 'PesterResults',
-    [switch]$append,
-    [switch]$Show
+  [string]$WorkSheetName = 'PesterResults',
+  [switch]$append,
+  [switch]$Show
 )
 
-$InvokePesterParams = @{OutputFormat = 'NUnitXml'} + $PSBoundParameters
-if (-not $InvokePesterParams['OutputFile']) {
-         $InvokePesterParams['OutputFile'] = Join-Path -ChildPath 'Pester.xml'-Path ([environment]::GetFolderPath([System.Environment+SpecialFolder]::MyDocuments))
-}
-if ($InvokePesterParams['Show']  ) {}
-if ($InvokePesterParams['XLFile']) {$InvokePesterParams.Remove('XLFile')}
-else                   {$XLFile =   $InvokePesterParams['OutputFile'] -replace '.xml$','.xlsx'}
+$InvokePesterParams = $PSBoundParameters
+
+if ($InvokePesterParams['XLFile']) { $InvokePesterParams.Remove('XLFile') }
+else { $XLFile = $InvokePesterParams['OutputFile'] -replace '.xml$', '.xlsx' }
 if (-not $UseExisting) {
-    $InvokePesterParams.Remove('Append')
-    $InvokePesterParams.Remove('UseExisting')
-    $InvokePesterParams.Remove('Show')
-    $InvokePesterParams.Remove('WorkSheetName')
-    Invoke-Pester @InvokePesterParams
+  $InvokePesterParams.Remove('Append') | Out-Null
+  $InvokePesterParams.Remove('UseExisting') | Out-Null
+  $InvokePesterParams.Remove('Show') | Out-Null
+  $InvokePesterParams.Remove('WorkSheetName') | Out-Null
+  $InvokePesterParams.Remove('OutputFile') | Out-Null
+  Set-Location $env:ModulePath
+  Invoke-Pester @InvokePesterParams -CI -Output Detailed -ErrorAction Continue 
 }
 
-if (-not (Test-Path -Path $InvokePesterParams['OutputFile'])) {
-    throw "Could not output file $($InvokePesterParams['OutputFile'])"; return
-}
+# if (-not (Test-Path -Path $InvokePesterParams['OutputFile'])) {
+#   throw "Could not output file $($InvokePesterParams['OutputFile'])"; return
+# }
 
-$resultXML   = ([xml](Get-Content $InvokePesterParams['OutputFile'])).'test-results'
-$startDate   = [datetime]$resultXML.date
-$startTime   = $resultXML.time
-$machine     = $resultXML.environment.'machine-name'
-#$user       = $resultXML.environment.'user-domain' + '\' + $resultXML.environment.user
-$os          = $resultXML.environment.platform -replace '\|.*$'," $($resultXML.environment.'os-version')"
+$resultXML = ([xml](Get-Content -Path (Join-Path $env:ModulePath 'testResults.xml'))).'test-results'
+$startDate = [datetime]$resultXML.date
+$startTime = $resultXML.time
+$machine = $resultXML.environment.'machine-name'
+$user = $resultXML.environment.'user-domain' + '\' + $resultXML.environment.user
+$os = $resultXML.environment.platform -replace '\|.*$', " $($resultXML.environment.'os-version')"
 <#hierarchy goes
     root, [date], start [time], [Name] (always "Pester"), test results broken down as [total],[errors],[failures],[not-run] etc.
       Environment (user & machine info)
@@ -80,52 +78,54 @@ $os          = $resultXML.environment.platform -replace '\|.*$'," $($resultXML.e
                              Test-case  [description] - name as rendered for display with <vars> filled in
 #>
 $testResults = foreach ($test in $resultXML.'test-suite'.results.'test-suite') {
-    $testPs1File         = $test.name
-    #Test if there are context blocks in the hierarchy OR if we go straight from Describe to test-case
-    if ($test.results.'test-suite'.results.'test-suite' -ne $null) {
-        foreach ($suite in $test.results.'test-suite')  {
-            $Describe    = $suite.description
-            foreach ($subsuite in $suite.results.'test-suite') {
-              $Context     = $subsuite.description
-              if ($subsuite.results.'test-suite'.results.'test-case') {
-                    $testCases = $subsuite.results.'test-suite'.results.'test-case'
-              }
-              else {$testCases = $subsuite.results.'test-case'}
-              $testCases | ForEach-Object {
-                New-Object -TypeName psobject -Property ([ordered]@{
-                   Machine  = $machine    ; OS       = $os
-                   Date     = $startDate  ; Time     = $startTime
-                   Executed = $(if ($_.executed -eq 'True') {1})
-                   Success  = $(if ($_.success  -eq 'True') {1})
-                   Duration = $_.time
-                   File     = $testPs1File; Group    = $Describe
-                   SubGroup = $Context    ; Name     =($_.Description -replace '\s{2,}', ' ')
-                   Result   = $_.result   ; FullDesc = '=Group&" "&SubGroup&" "&Name'})
-              }
-            }
+  $testPs1File = $test.name
+  #Test if there are context blocks in the hierarchy OR if we go straight from Describe to test-case
+  if ($test.results.'test-suite'.results.'test-suite' -ne $null) {
+    foreach ($suite in $test.results.'test-suite') {
+      $Describe = $suite.description
+      foreach ($subsuite in $suite.results.'test-suite') {
+        $Context = $subsuite.description
+        if ($subsuite.results.'test-suite'.results.'test-case') {
+          $testCases = $subsuite.results.'test-suite'.results.'test-case'
         }
-    }
-    else {
-        $test.results.'test-suite' | ForEach-Object {
-            $Describe = $_.description
-            $_.results.'test-case'| ForEach-Object {
-                New-Object -TypeName psobject -Property ([ordered]@{
-                   Machine  = $machine    ; OS       = $os
-                   Date     = $startDate  ; Time     = $startTime
-                   Executed = $(if ($_.executed -eq 'True') {1})
-                   Success  = $(if ($_.success  -eq 'True') {1})
-                   Duration = $_.time
-                   File     = $testPs1File; Group    = $Describe
-                   SubGroup = $null       ; Name     =($_.Description -replace '\s{2,}', ' ')
-                   Result   = $_.result   ; FullDesc = '=Group&" "&Test'})
-            }
+        else { $testCases = $subsuite.results.'test-case' }
+        $testCases | ForEach-Object {
+          New-Object -TypeName psobject -Property ([ordered]@{
+              Machine = $machine    ; OS = $os
+              Date = $startDate  ; Time = $startTime
+              Executed = $(if ($_.executed -eq 'True') { 1 })
+              Success = $(if ($_.success -eq 'True') { 1 })
+              Duration = $_.time
+              File = $testPs1File; Group = $Describe
+              SubGroup = $Context    ; Name = ($_.Description -replace '\s{2,}', ' ')
+              Result = $_.result   ; FullDesc = '=Group&" "&SubGroup&" "&Name'
+            })
         }
+      }
+    }
+  }
+  else {
+    $test.results.'test-suite' | ForEach-Object {
+      $Describe = $_.description
+      $_.results.'test-case' | ForEach-Object {
+        New-Object -TypeName psobject -Property ([ordered]@{
+            Machine = $machine    ; OS = $os
+            Date = $startDate  ; Time = $startTime
+            Executed = $(if ($_.executed -eq 'True') { 1 })
+            Success = $(if ($_.success -eq 'True') { 1 })
+            Duration = $_.time
+            File = $testPs1File; Group = $Describe
+            SubGroup = $null       ; Name = ($_.Description -replace '\s{2,}', ' ')
+            Result = $_.result   ; FullDesc = '=Group&" "&Test'
+          })
+      }
     }
+  }
 }
-if (-not $testResults) {Write-Warning 'No Results found' ; return}
+if (-not $testResults) { Write-Warning 'No Results found' ; return }
 $clearSheet = -not $Append
-$excel      =  $testResults | Export-Excel  -Path $xlFile -WorkSheetname $WorkSheetName -ClearSheet:$clearSheet -Append:$append -PassThru  -BoldTopRow -FreezeTopRow -AutoSize -AutoFilter -AutoNameRange
-$ws         =  $excel.Workbook.Worksheets[$WorkSheetName]
+$excel = $testResults | Export-Excel  -Path $xlFile -WorkSheetname $WorkSheetName -ClearSheet:$clearSheet -Append:$append -PassThru  -BoldTopRow -FreezeTopRow -AutoSize -AutoFilter -AutoNameRange
+$ws = $excel.Workbook.Worksheets[$WorkSheetName]
 <#  Worksheet should look like ..
   |A        |B             |C      D      |E        |F       |G          |H       |I        |J        |K    |L       |M
  1|Machine  |OS            |Date   Time   |Executed |Success |Duration   |File    |Group    |SubGroup |Name |Result  |FullDescription
@@ -136,7 +136,7 @@ $ws         =  $excel.Workbook.Worksheets[$WorkSheetName]
 Set-Column -Worksheet $ws -Column 3 -NumberFormat 'Short Date' # -AutoSize
 
 #Hide columns E to J (Executed, Success, Duration, File, Group and Subgroup)
-(5..10)   | ForEach-Object {Set-ExcelColumn -Worksheet $ws -Column $_ -Hide }
+(5..10)   | ForEach-Object { Set-ExcelColumn -Worksheet $ws -Column $_ -Hide }
 
 #Use conditional formatting to make Failures red, and Successes green (skipped remains black ) ... and save
 $endRow = $ws.Dimension.End.Row