Merge pull request #373 from lipkau/fix/#372-RemoveTrailingSlashFromJiraServerUrl

lipkau · web-flow · commit d6ecd393405f · 2019-08-20T18:18:08.000+02:00
Added check for trailing `/` to be removed from `JiraServerUrl`
diff --git a/JiraPS/Public/Get-JiraConfigServer.ps1 b/JiraPS/Public/Get-JiraConfigServer.ps1
@@ -12,7 +12,7 @@ function Get-JiraConfigServer {
         Write-DebugMessage "[$($MyInvocation.MyCommand.Name)] ParameterSetName: $($PsCmdlet.ParameterSetName)"
         Write-DebugMessage "[$($MyInvocation.MyCommand.Name)] PSBoundParameters: $($PSBoundParameters | Out-String)"
 
-        return $script:JiraServerUrl
+        return ($script:JiraServerUrl -replace "\/$", "")
     }
 
     end {
diff --git a/Tests/JiraPS.Tests.ps1 b/Tests/JiraPS.Tests.ps1
@@ -70,7 +70,7 @@ Describe "General project validation" -Tag Unit {
 
         Import-Module $env:BHManifestToTest -Force
 
-        Get-JiraConfigServer | Should -Be "https://example.com/"
+        Get-JiraConfigServer | Should -Be "https://example.com"
     }
 
     # It "module is imported with default prefix" {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ function Get-JiraConfigServer {`
`12`	`12`	`Write-DebugMessage "[$($MyInvocation.MyCommand.Name)] ParameterSetName: $($PsCmdlet.ParameterSetName)"`
`13`	`13`	`Write-DebugMessage "[$($MyInvocation.MyCommand.Name)] PSBoundParameters: $($PSBoundParameters \| Out-String)"`
`14`	`14`
`15`		`- return $script:JiraServerUrl`
	`15`	`+ return ($script:JiraServerUrl -replace "\/$", "")`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`end {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ Describe "General project validation" -Tag Unit {`
`70`	`70`
`71`	`71`	`Import-Module $env:BHManifestToTest -Force`
`72`	`72`
`73`		`- Get-JiraConfigServer \| Should -Be "https://example.com/"`
	`73`	`+ Get-JiraConfigServer \| Should -Be "https://example.com"`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`# It "module is imported with default prefix" {`