Adding test and release Utilities (#84)

* added test module * added tools * Moved files * updated paths * updated paths * added test data * fixed paths * rem old tests * added ps 6 return * fixed root path * rem local file * rem old files * fixed path * added PS core check
microsoft · Aug 22, 2018 · 14b7ab2 · 14b7ab2
1 parent ef79f64
commit 14b7ab2
Show file tree

Hide file tree

Showing 22 changed files with 3,466 additions and 229 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 # Cloned modules
 DSCResource.Tests
-PowerStig.Tests
 
 # Editors
 .vscode/
 .vs/
+
+# local preference scripts/utilities
+.local/
diff --git a/Tests/Integration/.tests.header.ps1 b/Tests/Integration/.tests.header.ps1
@@ -3,14 +3,6 @@ $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 $script:moduleName = 'PowerStig.Convert'
 $script:modulePath = "$($script:moduleRoot)\$($script:moduleName).psm1"
 
-if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests\TestHelper.psm1'))) )
-{
-    & git @('clone', 'https://github.com/Microsoft/PowerStig.Tests', (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests'))
-}
-
-Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (
-                     Join-Path -Path 'PowerStig.Tests' -ChildPath 'TestHelper.psm1')
-                     ) -Force
-
+$helperModulePath = Join-Path -Path $script:moduleRoot -ChildPath 'Tools\TestHelper\TestHelper.psm1'
+Import-Module $helperModulePath -Force
 Import-Module $modulePath -Force
diff --git a/Tests/Integration/DSCResources/.tests.header.ps1 b/Tests/Integration/DSCResources/.tests.header.ps1
@@ -9,7 +9,7 @@ if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCR
     & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'Tests\helper.psm1' ) -Force
+Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'Tools\TestHelper\TestHelper.psm1' ) -Force
 Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `

diff --git a/Tests/Integration/PowerStig.Integration.tests.ps1 b/Tests/Integration/PowerStig.Integration.tests.ps1
@@ -4,13 +4,7 @@ $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 $script:moduleName = 'PowerStig'
 $script:modulePath = "$($script:moduleRoot)\$($script:moduleName).psd1"
 
-if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests'))) -or `
-    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests\TestHelper.psm1'))) )
-{
-    & git @('clone', 'https://github.com/Microsoft/PowerStig.Tests', (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests'))
-}
-
-Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (Join-Path -Path 'PowerStig.Tests' -ChildPath 'TestHelper.psm1')) -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'Tools\TestHelper\TestHelper.psm1') -Force
 Import-Module $modulePath -Force
 #endregion
 

diff --git a/Tests/Unit/.tests.header.ps1 b/Tests/Unit/.tests.header.ps1
@@ -0,0 +1,13 @@
+# Unit Test Header
+$script:moduleSection = Split-Path -Path (Split-Path -Path (Get-PSCallStack)[1].ScriptName -Parent ) -Leaf
+$script:projectRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
+$script:toolsRoot = Join-Path -Path $script:projectRoot -ChildPath 'Tools'
+$script:moduleName = (Get-PSCallStack)[1].Command -replace '\.tests\.ps1', ''
+
+$script:modulePath = "$($script:projectRoot)\$($script:moduleSection)\$script:moduleName\$($script:moduleName).psm1"
+
+$helperModulePath = Join-Path -Path $script:toolsRoot -ChildPath (
+        Join-Path -Path 'TestHelper' -ChildPath 'TestHelper.psm1')
+
+Import-Module -Name $helperModulePath  -Force -Global
+Import-Module -Name $script:modulePath -Force
diff --git a/Tests/Unit/DSCResources/.tests.header.ps1 b/Tests/Unit/DSCResources/.tests.header.ps1
@@ -1,3 +1,3 @@
 # Unit Test Header
 $script:moduleRoot = Split-Path -Parent (Split-Path -Parent ( Split-Path -Parent $PSScriptRoot ) )
-Import-Module (Join-Path -Path $moduleRoot -ChildPath 'Tests\helper.psm1') -Force
+Import-Module (Join-Path -Path $moduleRoot -ChildPath 'Tools\TestHelper\TestHelper.psm1') -Force
diff --git a/Tests/Unit/DSCResources/Composite.tests.ps1 b/Tests/Unit/DSCResources/Composite.tests.ps1
@@ -2,7 +2,7 @@ $script:DSCModuleName = 'PowerStig'
 # Header
 
 $script:moduleRoot = Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $PSScriptRoot))
-Import-Module (Join-Path -Path $moduleRoot -ChildPath 'Tests\helper.psm1') -Force
+Import-Module (Join-Path -Path $moduleRoot -ChildPath 'Tools\TestHelper\TestHelper.psm1') -Force
 
 Describe 'Common Tests - Configuration Module Requirements' {
 

diff --git a/Tests/Unit/Module/.tests.header.ps1 b/Tests/Unit/Module/.tests.header.ps1
@@ -3,15 +3,7 @@ $script:moduleRoot = Split-Path -Parent (Split-Path -Parent (Split-Path -Parent
 $script:moduleName = (Get-PSCallStack)[1].Command -replace '\.tests\.ps1', ''
 $script:modulePath = "$($script:moduleRoot)$(($PSScriptRoot -split 'Unit')[1])\$script:moduleName\$($script:moduleName).psm1"
 
-if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests\TestHelper.psm1'))) )
-{
-    & git @('clone', 'https://github.com/Microsoft/PowerStig.Tests', (Join-Path -Path $script:moduleRoot -ChildPath 'PowerStig.Tests'))
-}
-
-Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath (
-                     Join-Path -Path 'PowerStig.Tests'  -ChildPath 'TestHelper.psm1')
-                    ) -Force -Global
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'Tools\TestHelper\TestHelper.psm1') -Force -Global
 
 <#
     Several classes check for duplicate rules against a global variable stigSettings.