variable value not always available in BeforeAll block, moved call f…

…or location into Before block to fix error. (#268)
OctopusDeploy · Jan 29, 2021 · 3f56344 · 3f56344
1 parent 24b448e
commit 3f56344
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/OctopusDSC/Tests/cOctopusServerActiveDirectoryAuthentication.Tests.ps1 b/OctopusDSC/Tests/cOctopusServerActiveDirectoryAuthentication.Tests.ps1
@@ -3,7 +3,6 @@
 $moduleName = Split-Path ($PSCommandPath -replace '\.Tests\.ps1$', '') -Leaf
 $script:modulePath = Split-Path $PSCommandPath -Parent
 $script:modulePath = Resolve-Path "$PSCommandPath/../../DSCResources/$moduleName/$moduleName.psm1"
-$script:dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
 $module = $null
 
 try
@@ -105,6 +104,7 @@ try
 
  Context 'Set-TargetResource' {
  BeforeAll {
+ $dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
  . $dscHelpersPath
  }
  It 'Calls Invoke-OctopusServerCommand with the correct arguments' {

diff --git a/OctopusDSC/Tests/cOctopusServerAzureADAuthentication.Tests.ps1 b/OctopusDSC/Tests/cOctopusServerAzureADAuthentication.Tests.ps1
@@ -3,7 +3,6 @@
 $moduleName = Split-Path ($PSCommandPath -replace '\.Tests\.ps1$', '') -Leaf
 $modulePath = Split-Path $PSCommandPath -Parent
 $modulePath = Resolve-Path "$PSCommandPath/../../DSCResources/$moduleName/$moduleName.psm1"
-$script:dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
 $module = $null
 
 try
@@ -105,6 +104,7 @@ try
 
  Context 'Set-TargetResource' {
  BeforeAll {
+ $dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
  . $dscHelpersPath
  }
  It 'Calls Invoke-OctopusServerCommand with the correct arguments' {

diff --git a/OctopusDSC/Tests/cOctopusServerGoogleAppsAuthentication.Tests.ps1 b/OctopusDSC/Tests/cOctopusServerGoogleAppsAuthentication.Tests.ps1
@@ -105,6 +105,7 @@ try
 
  Context 'Set-TargetResource' {
  BeforeAll {
+ $dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
  . $dscHelpersPath
  }
  It 'Calls Invoke-OctopusServerCommand with the correct arguments' {

diff --git a/OctopusDSC/Tests/cOctopusServerGuestAuthentication.Tests.ps1 b/OctopusDSC/Tests/cOctopusServerGuestAuthentication.Tests.ps1
@@ -3,7 +3,6 @@
 $moduleName = Split-Path ($PSCommandPath -replace '\.Tests\.ps1$', '') -Leaf
 $modulePath = Split-Path $PSCommandPath -Parent
 $modulePath = Resolve-Path "$PSCommandPath/../../DSCResources/$moduleName/$moduleName.psm1"
-$script:dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
 $module = $null
 
 try
@@ -78,6 +77,7 @@ try
 
  Context 'Set-TargetResource' {
  BeforeAll {
+ $dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
  . $dscHelpersPath
  }
  It 'Calls Invoke-OctopusServerCommand with the correct arguments' {

diff --git a/OctopusDSC/Tests/cOctopusServerOktaAuthentication.Tests.ps1 b/OctopusDSC/Tests/cOctopusServerOktaAuthentication.Tests.ps1
@@ -3,7 +3,6 @@
 $moduleName = Split-Path ($PSCommandPath -replace '\.Tests\.ps1$', '') -Leaf
 $modulePath = Split-Path $PSCommandPath -Parent
 $modulePath = Resolve-Path "$PSCommandPath/../../DSCResources/$moduleName/$moduleName.psm1"
-$script:dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
 $module = $null
 
 try
@@ -105,6 +104,7 @@ try
 
  Context 'Set-TargetResource' {
  BeforeAll {
+ $dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
  . $dscHelpersPath
  }
  It 'Calls Invoke-OctopusServerCommand with the correct arguments' {

diff --git a/OctopusDSC/Tests/cOctopusServerUsernamePasswordAuthentication.Tests.ps1 b/OctopusDSC/Tests/cOctopusServerUsernamePasswordAuthentication.Tests.ps1
@@ -3,7 +3,6 @@
 $moduleName = Split-Path ($PSCommandPath -replace '\.Tests\.ps1$', '') -Leaf
 $modulePath = Split-Path $PSCommandPath -Parent
 $modulePath = Resolve-Path "$PSCommandPath/../../DSCResources/$moduleName/$moduleName.psm1"
-$script:dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
 $module = $null
 
 try
@@ -78,6 +77,7 @@ try
 
  Context 'Set-TargetResource' {
  BeforeAll {
+ $dscHelpersPath = Resolve-Path "$PSCommandPath/../../OctopusDSCHelpers.ps1"
  . $dscHelpersPath
  }