Tests Added

Modules/Office365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1

@@ -28,7 +28,7 @@ function Get-TargetResource
         Description = $null
         ManagedBy = $null
         TenantId = $null
-	GlobalAdminAccount = $null
+        GlobalAdminAccount = $null
     }
 
     try
@@ -42,7 +42,7 @@ function Get-TargetResource
             return $nullReturn
         }
 
-	$groupMembers = Get-MsolGroupMember -GroupObjectId $group.ObjectId
+        $groupMembers = Get-MsolGroupMember -GroupObjectId $group.ObjectId
         return @{
             DisplayName = $group.DisplayName
             Description = $group.Description
@@ -85,13 +85,19 @@ function Set-TargetResource
     Write-Verbose -Message "Setting Office 365 Group $DisplayName"
     $CurrentParameters = $PSBoundParameters
     $CurrentParameters.Remove("GlobalAdminAccount")
-    $owner = Get-MsolUser -ObjectId $ManagedBy -ErrorAction SilentlyContinue
-    if(!$owner)
+    try
     {
-	$owner = Get-MsolUser -UserPrincipalName $ManagedBy
-	$currentParameters("ManagedBy") = $owner.ObjectId
+        $owner = Get-MsolUser -ObjectId $ManagedBy -ErrorAction SilentlyContinue
+    }
+    catch
+    {
+        if(!$owner)
+        {
+            $owner = Get-MsolUser -UserPrincipalName $ManagedBy
+            $CurrentParameters.ManagedBy = $owner.ObjectId
+        }        
     }
-    $group = New-MsolGroup @CurrentParameters
+    New-MsolGroup @CurrentParameters
 }
 
 function Test-TargetResource

Modules/Office365DSC/Examples/ProofOfConcept.ps1

@@ -36,6 +36,14 @@ Configuration ProofOfConcept
             LicenseAssignment = "O365dsc1:ENTERPRISEPREMIUM"
             GlobalAdminAccount = $credsGlobalAdmin
         }
+
+        O365Group MarkTeam
+        {
+            DisplayName = "Mark's Team"
+            Description = "Team for Mark"
+            ManagedBy = "[email protected]"
+            GlobalAdminAccount = $credsGlobalAdmin
+        }
     }
 }
 

Tests/Unit/Office365DSC/Office365DSC.O365User.ps1

@@ -0,0 +1,48 @@
+[CmdletBinding()]
+param(
+    [Parameter()]
+    [string] 
+    $CmdletModule = (Join-Path -Path $PSScriptRoot `
+                                         -ChildPath "..\Stubs\Office365DSC.psm1" `
+                                         -Resolve)
+)
+
+Import-Module -Name (Join-Path -Path $PSScriptRoot `
+                                -ChildPath "..\UnitTestHelper.psm1" `
+                                -Resolve)
+
+$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule `
+                                              -DscResource "O365User"
+
+Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
+    InModuleScope -ModuleName $Global:SPDscHelper.ModuleName -ScriptBlock {
+        Invoke-Command -ScriptBlock $Global:DscHelper.InitializeScript -NoNewScope
+
+        $secpasswd = ConvertTo-SecureString "test@password1" -AsPlainText -Force
+        $GlobalAdminAccount = New-Object System.Management.Automation.PSCredential ("tenantadmin", $secpasswd)
+
+        # Test contexts 
+        Context -Name "When the site doesn't already exist" -Fixture {
+            $testParams = @{
+                UserPrincipalName = "[email protected]"
+                DisplayName = "John Smith"
+                FirstName = "John"
+                LastName = "Smith"
+                UsageLocation = "US"
+                LicenseAssignment = "CONTOSO:ENTERPRISE_PREMIUM"
+                Password = $GlobalAdminAccount
+                GlobalAdminAccount = $GlobalAdminAccount
+            }
+
+            Mock -CommandName New-MSOLUser -MockWith { 
+                return @{Url = $null}
+            }
+
+            It "Should return absent from the Get method" {
+                (Get-TargetResource @testParams).Ensure | Should Be "Absent" 
+            }
+        }
+    }
+}
+
+Invoke-Command -ScriptBlock $Global:SPDscHelper.CleanupScript -NoNewScope

Tests/Unit/Office365DSC/Office365DSC.SPOSite.ps1

@@ -12,13 +12,13 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot `
                                 -Resolve)
 
 $Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule `
-                                                -DscResource "SPAccessServiceApp"
+                                                -DscResource "SPOSite"
 
 Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
     InModuleScope -ModuleName $Global:SPDscHelper.ModuleName -ScriptBlock {
         Invoke-Command -ScriptBlock $Global:DscHelper.InitializeScript -NoNewScope
 
-	$secpasswd = ConvertTo-SecureString "test@password1" -AsPlainText -Force
+        $secpasswd = ConvertTo-SecureString "test@password1" -AsPlainText -Force
         $GlobalAdminAccount = New-Object System.Management.Automation.PSCredential ("tenantadmin", $secpasswd)
 
         # Test contexts 
@@ -27,8 +27,8 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                 Url = "https://contoso.com/sites/TestSite"
                 Owner = "[email protected]"
                 StorageQuota = 1000
-		CentralAdminUrl = "https://contoso-admin.sharepoint.com"
-		GlobalAdminAccount = $GlobalAdminAccount
+                CentralAdminUrl = "https://contoso-admin.sharepoint.com"
+                GlobalAdminAccount = $GlobalAdminAccount
             }
 
             Mock -CommandName New-SPOSite -MockWith {