Skip to content

Commit 56ff0ad

Browse files
authored
SqlServerDsc: Fix Pester 6 syntax in integration tests (#2468)
1 parent 846fbeb commit 56ff0ad

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
- SqlServerDsc
1616
- Several integration tests wrongly said that the command `Test-DscConfiguration`
1717
return `$true` when it is in fact return the string value `'True'`.
18+
- Some integration tests still wasn't converted correctly to Pester 6 syntax
1819
- DSC_SqlRS and DSC_SqlWindowsFirewall
1920
- Fixed a duplicated word in localized `TestFailedAfterSet` messages.
2021
- SqlServerDsc

tests/Integration/Resources/DSC_SqlRS_Default.Integration.Tests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
229229
}
230230
}
231231

232-
$webRequestStatusCode | Should-BeString -CaseSensitive 200
232+
$webRequestStatusCode | Should-Be 200
233233
}
234234

235235
It 'Should be able to access the Reports site without any error' {
@@ -291,7 +291,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
291291
}
292292
}
293293

294-
$webRequestStatusCode | Should-BeString -CaseSensitive 200
294+
$webRequestStatusCode | Should-Be 200
295295
}
296296
}
297297

@@ -473,7 +473,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
473473
}
474474
}
475475

476-
$webRequestStatusCode | Should-BeString -CaseSensitive 200
476+
$webRequestStatusCode | Should-Be 200
477477
}
478478

479479
It 'Should be able to access the Reports site without any error' {
@@ -535,7 +535,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
535535
}
536536
}
537537

538-
$webRequestStatusCode | Should-BeString -CaseSensitive 200
538+
$webRequestStatusCode | Should-Be 200
539539
}
540540
}
541541

tests/Integration/Resources/DSC_SqlRole.Integration.Tests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
207207

208208
$resourceCurrentState.Ensure | Should-Be 'Present'
209209
$resourceCurrentState.ServerRoleName | Should-Be $ConfigurationData.AllNodes.Role3Name
210-
$resourceCurrentState.Members | Should-Be @(
210+
$resourceCurrentState.Members | Should-BeCollection @(
211211
$ConfigurationData.AllNodes.User1Name
212212
$ConfigurationData.AllNodes.User2Name
213213
)
@@ -265,7 +265,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
265265
$resourceCurrentState.Ensure | Should-Be 'Present'
266266
$resourceCurrentState.ServerRoleName | Should-Be $ConfigurationData.AllNodes.Role1Name
267267

268-
$resourceCurrentState.Members | Should-Be @(
268+
$resourceCurrentState.Members | Should-BeCollection @(
269269
$ConfigurationData.AllNodes.User1Name
270270
$ConfigurationData.AllNodes.User2Name
271271
)
@@ -324,7 +324,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
324324
$resourceCurrentState.Ensure | Should-Be 'Present'
325325
$resourceCurrentState.ServerRoleName | Should-Be $ConfigurationData.AllNodes.Role2Name
326326

327-
$resourceCurrentState.Members | Should-Be @(
327+
$resourceCurrentState.Members | Should-BeCollection @(
328328
$ConfigurationData.AllNodes.User1Name
329329
$ConfigurationData.AllNodes.User2Name
330330
$ConfigurationData.AllNodes.User4Name
@@ -509,7 +509,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
509509
}
510510

511511
$currentState.Ensure | Should-Be 'Present'
512-
$currentState.Members | Should-Be @($testMemberName)
512+
$currentState.Members | Should-BeCollection @($testMemberName)
513513
$currentState.MembersToInclude | Should-BeFalsy
514514
$currentState.MembersToExclude | Should-BeFalsy
515515
}

tests/Integration/Resources/DSC_SqlWindowsFirewall.Integration.Tests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
135135
$resourceCurrentState.SourcePath | Should-Be $ConfigurationData.AllNodes.SourcePath
136136
$resourceCurrentState.DatabaseEngineFirewall | Should-BeTrue
137137
$resourceCurrentState.BrowserFirewall | Should-BeTrue
138-
$resourceCurrentState.ReportingServicesFirewall | Should-BeFalse
139-
$resourceCurrentState.AnalysisServicesFirewall | Should-BeFalse
140-
$resourceCurrentState.IntegrationServicesFirewall | Should-BeFalse
138+
$resourceCurrentState.ReportingServicesFirewall | Should-BeNull
139+
$resourceCurrentState.AnalysisServicesFirewall | Should-BeFalsy
140+
$resourceCurrentState.IntegrationServicesFirewall | Should-BeFalsy
141141
}
142142

143143
It 'Should return True when Test-DscConfiguration is run' {

0 commit comments

Comments
 (0)