diff --git a/PSConfluencePublisher/PageMeta.Tests.ps1 b/PSConfluencePublisher/PageMeta.Tests.ps1 index 3d9eebe..fed27bc 100755 --- a/PSConfluencePublisher/PageMeta.Tests.ps1 +++ b/PSConfluencePublisher/PageMeta.Tests.ps1 @@ -80,7 +80,7 @@ Describe 'Get-PageMeta' ` { $mockPageMeta = @{ 'Title' = 'foobar' - 'PageId' = '0123456789' + 'Id' = '0123456789' } $mockManifest = @( @@ -118,7 +118,7 @@ Describe 'Get-PageMeta' ` } Mock -ModuleName 'PageMeta' Update-PageMeta { - $PageId | Should -Be '123' + $Id | Should -Be '123' $Version | Should -Be 9 @@ -202,7 +202,7 @@ Describe 'Update-PageMeta' ` { { Update-PageMeta ` - -PageId '0123456789' ` + -Id '0123456789' ` -Title 'foobar' ` -Manifest @{} } | Should -Throw @@ -220,10 +220,10 @@ Describe 'Update-PageMeta' ` $pageMeta = Update-PageMeta ` -Title 'foobar' ` - -PageId '0123456789' ` + -Id '0123456789' ` -Manifest $mockManifest - $mockPageMeta.PageId | Should -Be '0123456789' + $mockPageMeta.Id | Should -Be '0123456789' } It 'updates extended' ` @@ -238,13 +238,13 @@ Describe 'Update-PageMeta' ` Update-PageMeta ` -Title 'foobar' ` - -PageId 'pageId' ` + -Id 'pageId' ` -Version 9001 ` -AncestorTitle 'ancestorTitle' ` -Hash 'hash' ` -Manifest $mockManifest - $mockPageMeta.PageId | Should -Be 'pageId' + $mockPageMeta.Id | Should -Be 'pageId' $mockPageMeta.Version | Should -Be 9001 diff --git a/PSConfluencePublisher/PageMeta.psm1 b/PSConfluencePublisher/PageMeta.psm1 index dbf49ae..21e0a8a 100755 --- a/PSConfluencePublisher/PageMeta.psm1 +++ b/PSConfluencePublisher/PageMeta.psm1 @@ -91,7 +91,7 @@ function Get-PageMeta Process { - If ($pageMeta -And $pageMeta.PageId) + If ($pageMeta -And $pageMeta.Id) { $pageMeta @@ -121,7 +121,7 @@ function Get-PageMeta elseif ($results.Count -eq 1) { Update-PageMeta ` - -PageId $results[0].id ` + -Id $results[0].id ` -Version ($results[0]._expandable | Select -ExpandProperty 'version') ` -Title $Title ` -Manifest $Manifest @@ -153,7 +153,8 @@ function Update-PageMeta #> Param( [Parameter(Mandatory)] [String] $Title, - [Parameter(Mandatory)] [String] $PageId, + # remote Confluence page instance id + [Parameter(Mandatory)] [String] $Id, [Parameter()] [Int] $Version, [Parameter()] [String] $AncestorTitle, [Parameter()] [String] $Hash, @@ -173,7 +174,7 @@ function Update-PageMeta throw "page titled `$Title` not indexed in Manifest." } - $pageMeta.PageId = $PageId + $pageMeta.Id = $Id If ($Version) {