Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- SqlServerDsc
- Several integration tests wrongly said that the command `Test-DscConfiguration`
return `$true` when it is in fact return the string value `'True'`.
Comment thread
johlju marked this conversation as resolved.
- DSC_SqlRS and DSC_SqlWindowsFirewall
- Fixed a duplicated word in localized `TestFailedAfterSet` messages.
- SqlServerDsc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Describe "<dscResourceFriendlyName>_Integration" -Tag @('Integration_SQL2016', '
}
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Comment thread
johlju marked this conversation as resolved.
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -163,7 +163,7 @@ Describe "<dscResourceFriendlyName>_Integration" -Tag @('Integration_SQL2016', '
$resourceCurrentState.Severity | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.NotificationMethod | Should-Be $ConfigurationData.AllNodes.NotificationMethod
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -154,7 +154,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.NotificationMethod | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.EmailAddress | Should-Be $ConfigurationData.AllNodes.EmailAddress
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -154,7 +154,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.EmailAddress | Should-Be $ConfigurationData.AllNodes.NewEmailAddress1
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -206,7 +206,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.EmailAddress | Should-Be ('{0};{1}' -f $ConfigurationData.AllNodes.NewEmailAddress1, $ConfigurationData.AllNodes.NewEmailAddress2 )
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -258,7 +258,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.EmailAddress | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Describe "$($script:dscResourceName)_Integration" -Skip {
$resourceCurrentState.Ensure | Should-Be 'Present'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ Describe "$($script:dscResourceName)_Integration" -Skip {
$resourceCurrentState.Ensure | Should-Be 'Absent'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/Integration/Resources/DSC_SqlAudit.Integration.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.MaximumRolloverFiles | Should-Be $ConfigurationData.AllNodes.MaximumRolloverFiles1
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -195,7 +195,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.AuditFilter | Should-Be $ConfigurationData.AllNodes.AuditFilter2
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -250,7 +250,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.AuditFilter | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -307,7 +307,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.MaximumRolloverFiles | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -362,7 +362,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.AuditFilter | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.OwnerName | Should-Be ('{0}\SqlAdmin' -f $env:COMPUTERNAME)
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -161,7 +161,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.Collation | Should-Be $ConfigurationData.AllNodes.Collation
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -215,7 +215,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.CompatibilityLevel | Should-Be $ConfigurationData.AllNodes.CompatibilityLevel
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -269,7 +269,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.RecoveryModel | Should-Be $ConfigurationData.AllNodes.RecoveryModel
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -323,7 +323,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.OwnerName | Should-Be $ConfigurationData.AllNodes.OwnerName
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -377,7 +377,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.SnapshotIsolation | Should-Be $ConfigurationData.AllNodes.SnapshotIsolation
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -435,7 +435,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.SnapshotIsolation | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.Path | Should-Be $ConfigurationData.AllNodes.DataFilePath
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -152,7 +152,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.Path | Should-Be $ConfigurationData.AllNodes.LogFilePath
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -204,7 +204,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.Path | Should-Be $ConfigurationData.AllNodes.BackupFilePath.TrimEnd('\')
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.TcpPort | Should-Be $ConfigurationData.AllNodes.TcpPort
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -150,7 +150,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$script:currentConfiguration = Get-DscConfiguration -Verbose -ErrorAction 'Stop'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -209,7 +209,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$resourceCurrentState.TcpPort | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantPermission.Permission | Should-ContainCollection @('Select')
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -290,7 +290,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantPermission.Permission | Should-ContainCollection @('Select')
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -355,7 +355,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantPermission.Permission | Should-ContainCollection @('Select')
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -433,7 +433,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantPermission.Permission | Should-ContainCollection @('Alter')
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -508,7 +508,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantPermission.Permission | Should-ContainCollection @('Alter')
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantState.Permission | Should-ContainCollection 'CreateTable'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -175,7 +175,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantState.Permission | Should-NotContainCollection 'CreateTable'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -242,7 +242,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$denyState.Permission | Should-ContainCollection 'CreateTable'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -313,7 +313,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$denyState.Permission | Should-BeFalsy
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -374,7 +374,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantState.Permission | Should-ContainCollection 'Select'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -435,7 +435,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantState.Permission | Should-NotContainCollection 'Select'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -496,7 +496,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantState.Permission | Should-ContainCollection 'Select'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down Expand Up @@ -557,7 +557,7 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016',
$grantState.Permission | Should-NotContainCollection 'Select'
}

It 'Should return $true when Test-DscConfiguration is run' {
It 'Should return True when Test-DscConfiguration is run' {
Test-DscConfiguration -Verbose -ErrorAction 'Stop' | Should-Be 'True'
}
}
Expand Down
Loading