Restore ci stuff

Author: itfranck

CI/CI.ps1

@@ -11,7 +11,7 @@ if ($Platform -like 'win*6') {
 }
 
 #Make sure we have the modules we need
-Import-Module .\Output\Selenium\Selenium.psd1 -Force -ErrorAction Stop
+Import-Module .\Selenium.psd1 -Force -ErrorAction Stop
 $checkImportExcel = Get-Module -ListAvailable ImportExcel
 if (-not ($checkImportExcel)) {
     Write-Verbose -Verbose 'Installing ImportExcel'

CI/pipeline.yml

@@ -1,48 +1,48 @@
 # https://aka.ms/yaml
 
 trigger:
-    branches:
-      include:
-      - '*'
-      # - master
-      # - releases/*
-    paths:
-      exclude:
+  branches:
+    include:
+      - "*"
+    # - master
+    # - releases/*
+  paths:
+    exclude:
       - additions.md
       - ChangeLog.Txt
       - README.md
 
 jobs:
-  - job: 'Windows'
+  - job: "Windows"
     pool:
-      vmImage: 'windows-latest'
+      vmImage: "windows-latest"
     steps:
-    - powershell: './CI/CI.ps1 -browserlist Chrome,Firefox,IE'
-      displayName: 'Run Test on Windows PowerShell'
-    - pwsh: './CI/CI.ps1 -browserlist Chrome'
-      displayName: 'Run Test on PowerShell core on Windows'
-    - task: PublishPipelineArtifact@1
-      inputs:
-        targetPath: '$(Build.ArtifactStagingDirectory)/results'
-        artifact: 'Windows Results'
-    - task: PublishTestResults@2
-      inputs:
-        testResultsFormat: 'NUnit'
-        testResultsFiles: '**/TestResults*.xml'
-        failTaskOnFailedTests: true
+      - powershell: "./CI/CI.ps1 -browserlist Chrome,Firefox,IE"
+        displayName: "Run Test on Windows PowerShell"
+      - pwsh: "./CI/CI.ps1 -browserlist Chrome"
+        displayName: "Run Test on PowerShell core on Windows"
+      - task: PublishPipelineArtifact@1
+        inputs:
+          targetPath: "$(Build.ArtifactStagingDirectory)/results"
+          artifact: "Windows Results"
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: "NUnit"
+          testResultsFiles: "**/TestResults*.xml"
+          failTaskOnFailedTests: true
 
-  - job: 'Ubuntu'
+  - job: "Ubuntu"
     pool:
-      vmImage: 'ubuntu-latest'
+      vmImage: "ubuntu-latest"
     steps:
-    - powershell: './CI/CI.ps1 -browserlist Chrome,Firefox'
-      displayName: 'Run Test on Linux'
-    - task: PublishPipelineArtifact@1
-      inputs:
-        targetPath: '$(Build.ArtifactStagingDirectory)/results'
-        artifact: 'Linux Results'
-    - task: PublishTestResults@2
-      inputs:
-        testResultsFormat: 'NUnit'
-        testResultsFiles: '**/TestResults*.xml'
-        failTaskOnFailedTests: true
+      - powershell: "./CI/CI.ps1 -browserlist Chrome,Firefox"
+        displayName: "Run Test on Linux"
+      - task: PublishPipelineArtifact@1
+        inputs:
+          targetPath: "$(Build.ArtifactStagingDirectory)/results"
+          artifact: "Linux Results"
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: "NUnit"
+          testResultsFiles: "**/TestResults*.xml"
+          failTaskOnFailedTests: true

Examples/Combined.tests.ps1

@@ -57,15 +57,12 @@ $ModaltestCases = @(
         modalXPath = '//*[@id="profile-modal-1"]/div/div'
     }
 )
-
-$Global:BrowserOptHash = $TestCaseSettings[$env:DefaultBrowser].DefaultOptions
+$BrowserOptHash = $TestCaseSettings[$env:DefaultBrowser].DefaultOptions
 $BrowserOptText = Build-StringFromHash $BrowserOptHash
 Describe "Testing the tailspin toys demo site at $env:SITE_URL" {
     BeforeAll {
         #Relying on environment variable to pick the browser. Capture ID for use in logs by requesting verbose and redirecting it.
-        Write-Verbose $env:SITE_URL -Verbose
-        Write-Verbose $env:DefaultBrowser -Verbose
-        $BrowserID = SeOpen -URL $env:SITE_URL -Options  $Global:BrowserOptHash -In $env:DefaultBrowser  4>&1
+        $BrowserID = SeOpen -URL $env:SITE_URL -Options  $BrowserOptHash -Verbose  4>&1
         $BrowserID = ($BrowserID.Message -replace '^Opened ', '') + ' on ' + [System.Environment]::OSVersion.Platform
     }
     Context "in $BrowserID with settings ($BrowserOptText)" {
@@ -254,7 +251,7 @@ if ($BrowserOptText) {
                 $Global:SeDriver                                               | Should      -BeNullOrEmpty
                 if ($DriverProcess.Id) {
                     (Get-Process -id $DriverProcess.id ).HasExited             | Should      -Be $true
-                } 
+                }
                 if ($BrowserProcess.Id) {
                     (Get-Process -id $BrowserProcess.id).HasExited             | Should      -Be $true
                 }