Move tests from script to Pester

actions · Mar 28, 2024 · 8c2ee1d · 8c2ee1d
1 parent f49fc5a
commit 8c2ee1d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/images/windows/scripts/build/Install-Wix.ps1 b/images/windows/scripts/build/Install-Wix.ps1
@@ -6,14 +6,9 @@
 Install-ChocoPackage wixtoolset -ArgumentList "--force"
 
 Update-Environment
-
-$wixBinPath = Join-Path -Path $env:WIX -ChildPath 'bin'
-if (Test-Path $wixBinPath) {
-    $currentPath = [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
-    $newPath = $currentPath + ";$wixBinPath"
-    [Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine")
-} else {
-    Write-Error "WIX binaries folder ($wixBinPath) not found."
-}
+$currentPath = [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
+$newPath = $currentPath + ";$(Join-Path -Path $env:WIX -ChildPath "bin")"
+[Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine")
+Update-Environment
 
 Invoke-PesterTests -TestFile "Wix"
diff --git a/images/windows/scripts/tests/Wix.Tests.ps1 b/images/windows/scripts/tests/Wix.Tests.ps1
@@ -9,7 +9,15 @@ Describe "Wix" {
       $version | Should -Not -BeNullOrEmpty
     }
 
-    It "Wix binaries are available" {
-      candle.exe -? | Should -Not -BeNullOrEmpty
+    It "Wix variable exists" {
+      $env:WIX | Should -Not -BeNullOrEmpty
+    }
+
+    It "Wix binaries folder exists" {
+      Test-Path -Path "$env:WIX\bin" | Should -Be $true
+    }
+
+    It "Wix binaries folder is in PATH" {
+      $env:PATH -split ";" | Should -Contain "$env:WIX\bin"
     }
 }