review changes

PowerShell · Jan 27, 2017 · e21436c · e21436c
1 parent b275db0
commit e21436c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/DscResources/MSFT_UserResource/MSFT_UserResource.psm1 b/DscResources/MSFT_UserResource/MSFT_UserResource.psm1
@@ -709,15 +709,15 @@ function Get-TargetResourceOnNanoServer
         $UserName
     )
 
-    Set-StrictMode -Version Latest
-
     Assert-UserNameValid -UserName $UserName
 
+    $returnValue = @{}
+
     # Try to find a user by a name
     try
     {
         Write-Verbose -Message 'Starting Get-TargetResource on NanoServer'
-        $user = Find-UserByNameOnNanoServer -UserName $UserName -ErrorAction 'Stop'
+        $user = Find-UserByNameOnNanoServer -UserName $UserName
 
         # The user is found. Return all user properties and Ensure = 'Present'.
         $returnValue = @{
@@ -738,15 +738,13 @@ function Get-TargetResourceOnNanoServer
         {
             $returnValue.Add('PasswordNeverExpires', $true)
         }
-
-        return $returnValue
     }
     catch [System.Exception]
     {
         if ($_.FullyQualifiedErrorId -match 'UserNotFound')
         {
             # The user is not found
-            return @{
+            $returnValue = @{
                 UserName = $UserName
                 Ensure = 'Absent'
             }
@@ -756,6 +754,8 @@ function Get-TargetResourceOnNanoServer
             New-InvalidOperationException -ErrorRecord $_
         }
     }
+
+    return $returnValue
 }
 
 <#
@@ -846,7 +846,7 @@ function Set-TargetResourceOnNanoServer
 
     try
     {
-        $user = Find-UserByNameOnNanoServer -UserName $UserName -ErrorAction 'Stop'
+        $user = Find-UserByNameOnNanoServer -UserName $UserName
         $userExists = $true
     }
     catch [System.Exception]
@@ -1028,14 +1028,12 @@ function Test-TargetResourceOnNanoServer
         $PasswordChangeNotAllowed
     )
 
-    Set-StrictMode -Version Latest
-
     Assert-UserNameValid -UserName $UserName
 
     # Try to find a user by a name
     try
     {
-        $user = Find-UserByNameOnNanoServer -UserName $UserName -ErrorAction 'Stop'
+        $user = Find-UserByNameOnNanoServer -UserName $UserName
     }
     catch [System.Exception]
     {

diff --git a/Tests/Unit/MSFT_UserResource.Tests.ps1 b/Tests/Unit/MSFT_UserResource.Tests.ps1
@@ -740,7 +740,7 @@ try {
                         $testTargetResourceResult | Should Be $false 
                     }
 
-                    It 'Should throw an Invalid Operation exception' {
+                    It 'Should throw an Invalid Operation exception when there are multiple users with the given name' {
                         $exception = New-Object -TypeName 'InvalidOperationException' `
                                                 -ArgumentList @($null)
                         $errorRecord = New-Object -TypeName System.Management.Automation.ErrorRecord `