fixing some of the pester tests and the helper module.

dsccommunity · Apr 18, 2020 · cbe6efc · cbe6efc
1 parent 7ac7480
commit cbe6efc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/source/DSCResources/MSFT_xExchReceiveConnector/MSFT_xExchReceiveConnector.psm1 b/source/DSCResources/MSFT_xExchReceiveConnector/MSFT_xExchReceiveConnector.psm1
@@ -550,6 +550,7 @@ function Set-TargetResource
                     ExtendedRightDenyEntries  = $ExtendedRightDenyEntries
                     DomainController          = $DomainController
                     Identity                  = $Identity.Split('\')[1]
+                    NewObject                 = $false
                 }
 
                 Set-ADExtendedPermissions @splat

diff --git a/source/Modules/xExchangeHelper/xExchangeHelper.psd1 b/source/Modules/xExchangeHelper/xExchangeHelper.psd1
@@ -125,7 +125,8 @@
         'Set-DSCMachineStatus',
         'Test-ExtendedRightsPresent',
         'Test-ExtendedRights',
-        'Get-ADExtendedPermissions'
+        'Get-ADExtendedPermissions',
+        'Set-ADExtendedPermissions'
     )
 
     # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.

diff --git a/source/Modules/xExchangeHelper/xExchangeHelper.psm1 b/source/Modules/xExchangeHelper/xExchangeHelper.psm1
@@ -2799,6 +2799,7 @@ function Set-ADExtendedPermissions
 {
     [CmdletBinding()]
     param (
+        [Parameter()]
         [Microsoft.Management.Infrastructure.CimInstance[]]
         $ExtendedRightAllowEntries = @(),
 

diff --git a/tests/Unit/MSFT_xExchReceiveConnector.tests.ps1 b/tests/Unit/MSFT_xExchReceiveConnector.tests.ps1
@@ -241,15 +241,7 @@ try
                             value = 'ms-Exch-SMTP-Accept-Any-Recipient,ms-Exch-SMTP-Accept-Any-Sender'
                         } -ClientOnly
 
-                        Mock -CommandName 'Get-ADPermission' -Verifiable -ParameterFilter { $Identity -eq 'ReceiveConnector' } -MockWith {
-                            return $setTargetResourcePermissions['ExtendedRightAllowEntries']
-                        }
-                        Mock -CommandName 'Add-ADPermission' -Verifiable -ParameterFilter {
-                            $Identity -eq 'ReceiveConnector' -and
-                            $User -eq 'User1Allow' -and
-                            ($ExtendedRights -eq 'ms-Exch-SMTP-Accept-Any-Recipient' -or
-                                $ExtendedRights -eq 'ms-Exch-SMTP-Accept-Any-Sender')
-                        }
+                        Mock -CommandName 'Set-ADExtendedPermissions ' -Verifiable -ParameterFilter { $Identity -eq 'ReceiveConnector'}
 
                         Set-TargetResource @setTargetResourcePermissions
                     }

diff --git a/tests/Unit/xExchangeHelper.tests.ps1 b/tests/Unit/xExchangeHelper.tests.ps1
@@ -3164,7 +3164,7 @@ try
                 It 'Should throw when the object is not found' {
                     Mock -CommandName 'Get-ADPermission' -Verifiable -ParameterFilter { $Identity -eq 'FakeADObject' }
 
-                    & { Set-ADExtendedPermissions -Identity 'FakeADobject' -NewObject } | Should -Throw "The AD Object $Identity was not found after 2 minutes of wait time. Please check AD replication!"
+                    { Set-ADExtendedPermissions -Identity 'FakeADobject' -NewObject } | Should -Throw "The AD Object $Identity was not found after 2 minutes of wait time. Please check AD replication!"
                 }
                 It 'Should set the allow Permissions when specified' {
                     $ExtendedRightAllowEntries = New-CimInstance -ClassName MSFT_KeyValuePair -Property @{