Merge pull request #224 from gigi81/path-fix

Fixed regression issue #222
dsccommunity · Sep 2, 2016 · 532db4c · 532db4c
2 parents 04820f9 + 0ca9e23
commit 532db4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.psm1 b/DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.psm1
@@ -153,8 +153,10 @@ function Set-TargetResource
                 $webApplication.physicalPath -ne $PhysicalPath))
             {
                 Write-Verbose -Message ($LocalizedData.VerboseSetTargetPhysicalPath -f $Name)
+                #Note: read this before touching the next line of code:
+                #      https://github.com/PowerShell/xWebAdministration/issues/222
                 Set-WebConfigurationProperty `
-                    -Filter $webApplication.ItemXPath `
+                    -Filter "$($webApplication.ItemXPath)/virtualDirectory[@path='/']" `
                     -Name physicalPath `
                     -Value $PhysicalPath
             }
@@ -164,6 +166,8 @@ function Set-TargetResource
                 ($webApplication.applicationPool -ne $WebAppPool))
             {
                 Write-Verbose -Message ($LocalizedData.VerboseSetTargetWebAppPool -f $Name)
+                #Note: read this before touching the next line of code:
+                #      https://github.com/PowerShell/xWebAdministration/issues/222
                 Set-WebConfigurationProperty `
                     -Filter $webApplication.ItemXPath `
                     -Name applicationPool `

diff --git a/Tests/Unit/MSFT_xWebApplication.Tests.ps1 b/Tests/Unit/MSFT_xWebApplication.Tests.ps1
@@ -675,7 +675,7 @@ try
                     Assert-MockCalled -CommandName Get-WebApplication -Exactly 1
                     Assert-MockCalled -CommandName Set-WebConfigurationProperty -Exactly 1 `
                                       -ParameterFilter { `
-                                        ($Filter -eq "/system.applicationHost/sites/site[@name='MockSite']/application[@path='/MockPool']") -And `
+                                        ($Filter -eq "/system.applicationHost/sites/site[@name='MockSite']/application[@path='/MockPool']/virtualDirectory[@path='/']") -And `
                                         ($Name   -eq 'physicalPath') -And `
                                         ($Value  -eq 'C:\MockSite\MockApp') `
                                       }