Apply Suggestion and fix preview sort

dsccommunity · Oct 30, 2023 · 845b87c · 845b87c
1 parent 4c99390
commit 845b87c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/source/Public/Get-SqlDscPreferredModule.ps1 b/source/Public/Get-SqlDscPreferredModule.ps1
@@ -118,7 +118,7 @@ function Get-SqlDscPreferredModule
             {
                 # Get the latest version if available
                 $availableModule = $preferredModules |
-                    Sort-Object -Property { ($_.CalculatedVersion -replace '-.+$') -as [version] }, { $_ } -Descending |
+                    Sort-Object -Property { ($_.CalculatedVersion -replace '-.+$') -as [System.Version] }, { $_.CalculatedVersion } -Descending |
                     Select-Object -First 1
             }
 

diff --git a/tests/Unit/Public/Get-SqlDscPreferredModule.Tests.ps1 b/tests/Unit/Public/Get-SqlDscPreferredModule.Tests.ps1
@@ -368,6 +368,15 @@ Describe 'Get-SqlDscPreferredModule' -Tag 'Public' {
                         }
                     }
                 }
+                $sqlServerModule3 = New-MockObject -Type 'PSModuleInfo' -Properties @{
+                    Name = 'SqlServer'
+                    Version = [Version]::new(22, 1, 1)
+                    PrivateData = @{
+                        PSData = @{
+                            PreRelease = 'preview2'
+                        }
+                    }
+                }
                 $sqlpsModule1 = New-MockObject -Type 'PSModuleInfo' -Properties @{
                     Name = 'SQLPS'
                     Path = 'C:\Program Files (x86)\Microsoft SQL Server\130\Tools\PowerShell\Modules\SQLPS\Sqlps.ps1'
@@ -381,14 +390,15 @@ Describe 'Get-SqlDscPreferredModule' -Tag 'Public' {
                     return @(
                         $sqlServerModule1,
                         $sqlServerModule2,
+                        $sqlServerModule3,
                         $sqlpsModule1,
                         $sqlpsModule2
                     )
                 }
             }
 
             It 'Should return the latest first preferred module' {
-                Get-SqlDscPreferredModule -Name @('SqlServer', 'SQLPS') | Should -Be $sqlServerModule2
+                Get-SqlDscPreferredModule -Name @('SqlServer', 'SQLPS') | Should -Be $sqlServerModule3
             }
 
             Context 'When the environment variable SMODefaultModuleVersion is assigned a module version' {