xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

fixing url concatenation bug

Browse Source
This commit is contained in:
Patrik J. Braun 2019-01-19 13:00:38 +01:00
parent ca33bb1efb
commit 0e3b04c122
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/Utils.ts
View File

@ -90,14 +90,14 @@ export class Utils {
continue; continue;
} }
const part = args[i].replace('\\', '/'); const part = args[i].replace(new RegExp('\\\\', 'g'), '/');
if (part === '/' || part === './') { if (part === '/' || part === './') {
continue; continue;
} }
url += part + '/'; url += part + '/';
} }
url = url.replace('//', '/'); url = url.replace(new RegExp('/+', 'g'), '/');
if (url.trim() === '') { if (url.trim() === '') {
url = './'; url = './';

18
test/common/unit/Utils.spec.ts Normal file
View File

@ -0,0 +1,18 @@
import {expect} from 'chai';
import {Utils} from '../../../common/Utils';
describe('Utils', () => {
it('should concat urls', () => {
expect(Utils.concatUrls('abc', 'cde')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc/', 'cde')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc\\', 'cde')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc/', 'cde/')).to.be.equal('abc/cde');
expect(Utils.concatUrls('./abc\\', 'cde/')).to.be.equal('./abc/cde');
expect(Utils.concatUrls('abc/', '\\cde/')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc\\', '\\cde/')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc\\', '/cde/')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc/', '/cde/')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc\\/', '/cde/')).to.be.equal('abc/cde');
expect(Utils.concatUrls('abc\\/', '/cde/', 'fgh')).to.be.equal('abc/cde/fgh');
});
});