manual test

Author: kmaranionjc

ModuleChangelog.md

@@ -1,14 +1,6 @@
 ## 2.6.1
 
-Release Date: February 7, 2024
-
-#### Bug Fixes:
-```
-* Fix issue with manual release type not included in build
-```
-## 2.6.0
-
-Release Date: February 7, 2024
+Release Date: February 12, 2024
 
 #### RELEASE NOTES
 
@@ -20,6 +12,7 @@ Release Date: February 7, 2024
 ```
 * Addressed a issue where a registry hive fails to load, the tool will now halt migration instead of continuing
 * Fixed a bug with Module Changelog version test where release type number is not properly outputted
+* Fix issue with manual release type not included in tests
 ```
 ## 2.5.1
 

jumpcloud-ADMU/Powershell/Tests/Build.Tests.ps1

@@ -38,8 +38,15 @@ Describe "Module Validation Tests" {
             $masterform = (Invoke-WebRequest https://raw.githubusercontent.com/TheJumpCloud/jumpcloud-ADMU/master/jumpcloud-ADMU/Powershell/Form.ps1 -useBasicParsing).tostring()
             $masterVersion = Select-String -inputobject:($masterform) -Pattern:($VersionRegex)
             $masterformversion = [version]$masterversion.Matches.value
-            $branchformversion | Should -BeGreaterThan $masterformversion
-            $branchformversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
+            if($env:ModuleVersionType -eq "manual"){
+                # Manual Versioning
+                # Given version should be greater than master
+                $branchformversion | Should -BeGreaterThan $masterformversion
+            } else {
+                $branchformversion | Should -BeGreaterThan $masterformversion
+                $branchformversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
+            }
+
         }
 
         It 'Start-Migration version' {
@@ -50,8 +57,12 @@ Describe "Module Validation Tests" {
             $masterStartMigration = (Invoke-WebRequest https://raw.githubusercontent.com/TheJumpCloud/jumpcloud-ADMU/master/jumpcloud-ADMU/Powershell/Start-Migration.ps1 -useBasicParsing).tostring()
             $masterVersion = Select-String -inputobject:($masterStartMigration) -Pattern:($VersionRegex)
             $masterStartMigrationVersion = [version]$masterVersion.Matches.value
-            $branchStartMigrationVersion | Should -BeGreaterThan $masterStartMigrationVersion
-            $branchStartMigrationVersion.$($env:ModuleVersionType) | Should -Be ($masterStartMigrationVersion.$($env:ModuleVersionType) + 1)
+            if ($env:ModuleVersionType -eq "manual") {
+                $branchStartMigrationVersion | Should -BeGreaterThan $masterStartMigrationVersion
+            } else {
+                $branchStartMigrationVersion | Should -BeGreaterThan $masterStartMigrationVersion
+                $branchStartMigrationVersion.$($env:ModuleVersionType) | Should -Be ($masterStartMigrationVersion.$($env:ModuleVersionType) + 1)
+            }
         }
 
         It 'gui_jcadmu.exe version' -skip {
@@ -60,8 +71,12 @@ Describe "Module Validation Tests" {
             $masterVersion = Select-String -inputobject:($masterform) -Pattern:($VersionRegex)
             $masterformversion = [version]$masterversion.Matches.value
             $exeversion = [version](Get-Item ("$PSScriptRoot\..\..\exe\gui_jcadmu.exe")).VersionInfo.FileVersion
-            $exeversion | Should -BeGreaterThan $masterformversion
-            $exeversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
+            if ($env:ModuleVersionType -eq "manual") {
+                $exeversion | Should -BeGreaterThan $masterformversion
+            } else {
+                $exeversion | Should -BeGreaterThan $masterformversion
+                $exeversion.$($env:ModuleVersionType) | Should -Be ($masterformversion.$($env:ModuleVersionType) + 1)
+            }
         }
     }