Fix discovery test

Author: Gijsreyn

dsc/tests/dsc_extension_discover.tests.ps1

@@ -24,33 +24,41 @@ Describe 'Discover extension tests' {
         $out = dsc extension list | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
         if ($IsWindows) {
-            $out.Count | Should -Be 4 -Because ($out | Out-String)
+            $out.Count | Should -Be 5 -Because ($out | Out-String)
             $out[0].type | Should -Be 'Microsoft.DSC.Extension/Bicep'
             $out[0].version | Should -Be '0.1.0'
             $out[0].capabilities | Should -BeExactly @('import')
             $out[0].manifest | Should -Not -BeNullOrEmpty
-            $out[1].type | Should -Be 'Microsoft.DSC.Extension/WindowsPowerShell'
+            $out[1].type | Should -Be 'Microsoft.DSC.Extension/PowerShell'
             $out[1].version | Should -Be '0.1.0'
             $out[1].capabilities | Should -BeExactly @('import')
             $out[1].manifest | Should -Not -BeNullOrEmpty
-            $out[2].type | Should -Be 'Microsoft.Windows.Appx/Discover'
+            $out[2].type | Should -Be 'Microsoft.DSC.Extension/WindowsPowerShell'
             $out[2].version | Should -Be '0.1.0'
-            $out[2].capabilities | Should -BeExactly @('discover')
+            $out[2].capabilities | Should -BeExactly @('import')
             $out[2].manifest | Should -Not -BeNullOrEmpty
-            $out[3].type | Should -BeExactly 'Test/Discover'
-            $out[3].version | Should -BeExactly '0.1.0'
+            $out[3].type | Should -Be 'Microsoft.Windows.Appx/Discover'
+            $out[3].version | Should -Be '0.1.0'
             $out[3].capabilities | Should -BeExactly @('discover')
             $out[3].manifest | Should -Not -BeNullOrEmpty
+            $out[4].type | Should -BeExactly 'Test/Discover'
+            $out[4].version | Should -BeExactly '0.1.0'
+            $out[4].capabilities | Should -BeExactly @('discover')
+            $out[4].manifest | Should -Not -BeNullOrEmpty
         } else {
-            $out.Count | Should -Be 2 -Because ($out | Out-String)
+            $out.Count | Should -Be 3 -Because ($out | Out-String)
             $out[0].type | Should -Be 'Microsoft.DSC.Extension/Bicep'
             $out[0].version | Should -Be '0.1.0'
             $out[0].capabilities | Should -BeExactly @('import')
             $out[0].manifest | Should -Not -BeNullOrEmpty
-            $out[1].type | Should -BeExactly 'Test/Discover'
-            $out[1].version | Should -BeExactly '0.1.0'
-            $out[1].capabilities | Should -BeExactly @('discover')
+            $out[1].type | Should -Be 'Microsoft.DSC.Extension/PowerShell'
+            $out[1].version | Should -Be '0.1.0'
+            $out[1].capabilities | Should -BeExactly @('import')
             $out[1].manifest | Should -Not -BeNullOrEmpty
+            $out[2].type | Should -BeExactly 'Test/Discover'
+            $out[2].version | Should -BeExactly '0.1.0'
+            $out[2].capabilities | Should -BeExactly @('discover')
+            $out[2].manifest | Should -Not -BeNullOrEmpty
         }
     }
 

extensions/powershell/convertDscResource.psm1

@@ -6,6 +6,7 @@ if ($Script:IsPowerShellCore) {
     }
     Import-Module -Name 'PSDesiredStateConfiguration' -MinimumVersion 2.0.7 -Prefix 'Pwsh' -WarningAction SilentlyContinue -ErrorAction Stop
 } else {
+    "Loaded module paths: $env:PSModulePath" | Write-DscTrace -Operation Trace
     Import-Module -Name 'PSDesiredStateConfiguration' -RequiredVersion 1.1 -WarningAction SilentlyContinue -ErrorAction Stop
 }
 

extensions/powershell/powershell.tests.ps1

@@ -10,7 +10,7 @@ BeforeDiscovery {
 }
 
 Describe 'PowerShell extension tests' {
-    It 'Example PowerShell file should work' -Skip:(!$IsWindows -or !$isElevated) {
+    It 'Example PowerShell file should work' -Skip:(!$isElevated) {
             $powerShellConfiguration = @"
 configuration TestClassConfiguration {
     Import-DscResource -ModuleName TestClassResource
@@ -32,7 +32,7 @@ configuration TestClassConfiguration {
         (Get-Content -Path $TestDrive/error.log -Raw) | Should -Match "Importing file '$config_path' with extension 'Microsoft.DSC.Extension/PowerShell'"
     }
 
-    It 'Invalid PowerShell configuration document file returns error' -Skip:(!$IsWindows) {
+    It 'Invalid PowerShell configuration document file returns error' {
         $psFile = "$TestDrive/invalid.ps1"
         Set-Content -Path $psFile -Value @"
 configuration InvalidConfiguration {