self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2024-12-03 08:45:40 +02:00
Code Issues Releases Activity

fix double slash on buildURL (#615)

Browse Source
This commit is contained in:
Scott Bishel 2021-06-22 09:26:00 -06:00 committed by GitHub
parent 1f7470aca7
commit c86d9b9ff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
webapp/src/utils.test.ts
View File

@ -34,4 +34,36 @@ describe('utils', () => {
windowAsAny.openInNewBrowser = null
})
})
describe('test - buildURL', () => {
test('buildURL, no base', () => {
expect(Utils.buildURL('test', true)).toBe('http://localhost/test')
expect(Utils.buildURL('/test', true)).toBe('http://localhost/test')
expect(Utils.buildURL('test')).toBe('/test')
expect(Utils.buildURL('/test')).toBe('/test')
})
test('buildURL, base no slash', () => {
const windowAsAny = window as any
windowAsAny.baseURL = 'base'
expect(Utils.buildURL('test', true)).toBe('http://localhost/base/test')
expect(Utils.buildURL('/test', true)).toBe('http://localhost/base/test')
expect(Utils.buildURL('test')).toBe('base/test')
expect(Utils.buildURL('/test')).toBe('base/test')
})
test('buildUrl, base with slash', () => {
const windowAsAny = window as any
windowAsAny.baseURL = '/base/'
expect(Utils.buildURL('test', true)).toBe('http://localhost/base/test')
expect(Utils.buildURL('/test', true)).toBe('http://localhost/base/test')
expect(Utils.buildURL('test')).toBe('base/test')
expect(Utils.buildURL('/test')).toBe('base/test')
})
})
})

3
webapp/src/utils.ts
View File

@ -333,6 +333,9 @@ class Utils {
finalPath = baseURL + '/' + path
}
if (absolute) {
if (finalPath.indexOf('/') === 0) {
finalPath = finalPath.slice(1)
}
return window.location.origin + '/' + finalPath
}
return finalPath