should never reassign global

dataplat · Oct 18, 2024 · ce83dc5 · ce83dc5
1 parent 36831fb
commit ce83dc5
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 37 deletions.
diff --git a/tests/Backup-DbaDatabase.Tests.ps1 b/tests/Backup-DbaDatabase.Tests.ps1
@@ -152,8 +152,6 @@ Describe "Backup-DbaDatabase Unit Tests" -Tag 'UnitTests' {
 
 Describe "Backup-DbaDatabase Integration Tests" -Tag "IntegrationTests" {
     BeforeAll {
-        $global:instance1 = "localhost"
-        $global:instance2 = "localhost\SQL2019"
         $global:appveyorlabrepo = "C:\github\appveyor-lab"
         $global:DestBackupDir = 'C:\Temp\backups'
         $global:random = Get-Random

diff --git a/tests/Disable-DbaAgHadr.Tests.ps1 b/tests/Disable-DbaAgHadr.Tests.ps1
@@ -24,10 +24,6 @@ Describe "Disable-DbaAgHadr" {
     }
 
     Context "Integration Tests" -Tag "IntegrationTests" {
-        BeforeAll {
-            $global:instance3 = [Environment]::GetEnvironmentVariable('instance3')
-        }
-
         AfterAll {
             Enable-DbaAgHadr -SqlInstance $global:instance3 -Confirm:$false -Force
         }

diff --git a/tests/Get-DbaAgentSchedule.Tests.ps1 b/tests/Get-DbaAgentSchedule.Tests.ps1
@@ -22,12 +22,6 @@ Describe "Get-DbaAgentSchedule Unit Tests" -Tag 'UnitTests' {
 
 Describe "Get-DbaAgentSchedule Integration Tests" -Tag "IntegrationTests" {
     BeforeAll {
-        $global:instance2 = $env:COMPUTERNAME
-        $global:instance3 = $env:COMPUTERNAME
-
-        $server2 = Connect-DbaInstance -SqlInstance $global:instance2
-        $server3 = Connect-DbaInstance -SqlInstance $global:instance3
-
         $null = New-DbaAgentSchedule -SqlInstance $global:instance2 -Schedule dbatoolsci_MonthlyTest -FrequencyType Monthly -FrequencyInterval 10 -FrequencyRecurrenceFactor 1 -Force
         $null = New-DbaAgentSchedule -SqlInstance $global:instance2 -Schedule dbatoolsci_WeeklyTest -FrequencyType Weekly -FrequencyInterval 2 -FrequencyRecurrenceFactor 1 -StartTime 020000  -Force
         $null = New-DbaAgentSchedule -SqlInstance $global:instance3 -Schedule dbatoolsci_MonthlyTest -FrequencyType Monthly -FrequencyInterval 10 -FrequencyRecurrenceFactor 1 -Force

diff --git a/tests/Get-DbaPowerPlan.Tests.ps1 b/tests/Get-DbaPowerPlan.Tests.ps1
@@ -27,7 +27,7 @@ Describe "Get-DbaPowerPlan" {
 
     Context "Command actually works" {
         BeforeDiscovery {
-            $global:instance2 = $global:instance2 # Ensure this variable is available in the discovery phase
+            . "$PSScriptRoot\constants.ps1"
         }
         It "Should return result for the server" {
             $results = Get-DbaPowerPlan -ComputerName $global:instance2

diff --git a/tests/New-DbaAgentAlertCategory.Tests.ps1 b/tests/New-DbaAgentAlertCategory.Tests.ps1
@@ -28,7 +28,7 @@ Describe "New-DbaAgentAlertCategory" {
 
     Context "New Agent Alert Category is added properly" {
         BeforeAll {
-            $global:instance2 = "localhost"
+            . "$PSScriptRoot\constants.ps1"
         }
 
         AfterAll {

diff --git a/tests/New-DbaAgentJobCategory.Tests.ps1 b/tests/New-DbaAgentJobCategory.Tests.ps1
@@ -30,10 +30,6 @@ Describe "New-DbaAgentJobCategory" {
     }
 
     Context "New Agent Job Category is added properly" {
-        BeforeAll {
-            $global:instance2 = "localhost"
-        }
-
         It "Should have the right name and category type" {
             $results = New-DbaAgentJobCategory -SqlInstance $global:instance2 -Category CategoryTest1
             $results.Name | Should -Be "CategoryTest1"

diff --git a/tests/New-DbaAgentOperator.Tests.ps1 b/tests/New-DbaAgentOperator.Tests.ps1
@@ -64,7 +64,6 @@ Describe "New-DbaAgentOperator" {
     Context "New Agent Operator is added properly" {
         BeforeAll {
             $random = Get-Random
-            $global:instance2 = $env:COMPUTERNAME
             $server2 = Connect-DbaInstance -SqlInstance $global:instance2
             $email1 = "test1$($random)@test.com"
             $email2 = "test2$($random)@test.com"

diff --git a/tests/New-DbaXESmartReplay.Tests.ps1 b/tests/New-DbaXESmartReplay.Tests.ps1
@@ -2,8 +2,6 @@ param($ModuleName = 'dbatools')
 
 Describe "New-DbaXESmartReplay" {
     BeforeAll {
-        $CommandName = $MyInvocation.MyCommand.Name.Replace(".Tests.ps1", "")
-        Write-Host -Object "Running $PSCommandPath" -ForegroundColor Cyan
         . "$PSScriptRoot\constants.ps1"
     }
 
@@ -43,7 +41,7 @@ Describe "New-DbaXESmartReplay" {
 
 Describe "New-DbaXESmartReplay Integration Tests" -Tag "IntegrationTests" {
     BeforeAll {
-        $global:instance2 = [Environment]::GetEnvironmentVariable("instance2")
+        . "$PSScriptRoot\constants.ps1"
     }
 
     Context "Creates a smart object" {

diff --git a/tests/Remove-DbaAgentAlert.Tests.ps1 b/tests/Remove-DbaAgentAlert.Tests.ps1
@@ -32,7 +32,7 @@ Describe "Remove-DbaAgentAlert Unit Tests" -Tag 'UnitTests' {
 
 Describe "Remove-DbaAgentAlert Integration Tests" -Tag "IntegrationTests" {
     BeforeAll {
-        $global:instance2 = "localhost"
+        . "$PSScriptRoot\constants.ps1"
     }
 
     BeforeEach {

diff --git a/tests/Remove-DbaFirewallRule.Tests.ps1 b/tests/Remove-DbaFirewallRule.Tests.ps1
@@ -29,11 +29,6 @@ Describe "Remove-DbaFirewallRule Integration Tests" -Tag "IntegrationTests" {
     }
 
     Context "Command actually works" {
-        BeforeAll {
-            $global:instance1 = $global:instance1
-            $global:instance2 = $global:instance2
-        }
-
         It "Removes firewall rules" {
             # This test is a placeholder and needs to be implemented
             # when we have a proper way to create and remove firewall rules in a test environment

diff --git a/tests/Restore-DbaDatabase.Tests.ps1 b/tests/Restore-DbaDatabase.Tests.ps1
@@ -169,7 +169,6 @@ Describe "Restore-DbaDatabase Unit Tests" -Tag 'UnitTests' {
 
 Describe "Restore-DbaDatabase Integration Tests" -Tag "IntegrationTests" {
     BeforeAll {
-        $global:instance2 = "localhost"
         $env:appveyorlabrepo = "C:\github\appveyor-lab"
         $DataFolder = 'C:\temp\datafiles'
         $LogFolder = 'C:\temp\logfiles'

diff --git a/tests/Restore-DbaDbSnapshot.Tests.ps1 b/tests/Restore-DbaDbSnapshot.Tests.ps1
@@ -40,7 +40,7 @@ Describe "Restore-DbaDbSnapshot Unit Tests" -Tag 'UnitTests' {
 
 Describe "Restore-DbaDbSnapshot Integration Tests" -Tag "IntegrationTests" {
     BeforeAll {
-        $global:instance2 = $global:instance2
+        . "$PSScriptRoot\constants.ps1"
 
         Get-DbaProcess -SqlInstance $global:instance2 | Where-Object Program -match dbatools | Stop-DbaProcess -Confirm:$false -WarningAction SilentlyContinue
         $server = Connect-DbaInstance -SqlInstance $global:instance2

diff --git a/tests/Test-DbaDbLogShipStatus.Tests.ps1 b/tests/Test-DbaDbLogShipStatus.Tests.ps1
@@ -36,13 +36,9 @@ Describe "Test-DbaDbLogShipStatus Unit Tests" -Tag "UnitTests" {
 Describe "Test-DbaDbLogShipStatus Integration Tests" -Tag "IntegrationTests" {
     BeforeDiscovery {
         $env:skipIntegrationTests = $false
-        $global:instance1 = $null
-        $global:instance2 = $null
 
         try {
             . "$PSScriptRoot\constants.ps1"
-            $global:instance1 = $global:instance1
-            $global:instance2 = $global:instance2
         } catch {
             $env:skipIntegrationTests = $true
         }

diff --git a/tests/Test-DbaDiskAllocation.Tests.ps1 b/tests/Test-DbaDiskAllocation.Tests.ps1
@@ -30,7 +30,7 @@ Describe "Test-DbaDiskAllocation" {
 
     Context "Command actually works" {
         BeforeDiscovery {
-            $global:instance2 = $global:instance2 # Ensure this variable is in scope for discovery
+            . "$PSScriptRoot\constants.ps1"
         }
         It "Should return a result" {
             $results = Test-DbaDiskAllocation -ComputerName $global:instance2

diff --git a/tests/Test-DbaMaxDop.Tests.ps1 b/tests/Test-DbaMaxDop.Tests.ps1
@@ -2,7 +2,6 @@ param($ModuleName = 'dbatools')
 
 Describe "Test-DbaMaxDop" {
     BeforeAll {
-        $CommandName = $MyInvocation.MyCommand.Name.Replace(".Tests.ps1", "")
         . "$PSScriptRoot\constants.ps1"
     }
 
@@ -23,7 +22,7 @@ Describe "Test-DbaMaxDop" {
 
     Context "Command usage" {
         BeforeDiscovery {
-            $global:instance2 = $global:instance2
+            . "$PSScriptRoot\constants.ps1"
         }
 
         BeforeAll {