diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-07-13 10:57:52 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-07-13 10:57:52 +0200 |
| commit | 1b7d42c5691ffa21246022690f7688dda534c2dc (patch) | |
| tree | 618014ae955e23a5951cd76d70bd156a98859e16 /core/js/tests | |
| parent | 1006ec56ceb2c7c5bc14a5401d46767cb4b72e6c (diff) | |
| download | nextcloud-server-1b7d42c5691ffa21246022690f7688dda534c2dc.tar.gz nextcloud-server-1b7d42c5691ffa21246022690f7688dda534c2dc.zip | |
Fix OC.joinPaths with empty arguments
When empty arguments are given, the leading or trailing slash was not
detected properly.
Diffstat (limited to 'core/js/tests')
| -rw-r--r-- | core/js/tests/specs/coreSpec.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 7a09f362ee5..3ebe55305f7 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -147,11 +147,15 @@ describe('Core base tests', function() { }); it('keeps leading slashes', function() { expect(OC.joinPaths('/abc')).toEqual('/abc'); + expect(OC.joinPaths('/abc', '')).toEqual('/abc'); + expect(OC.joinPaths('', '/abc')).toEqual('/abc'); expect(OC.joinPaths('/abc', 'def')).toEqual('/abc/def'); expect(OC.joinPaths('/abc', 'def', 'ghi')).toEqual('/abc/def/ghi'); }); it('keeps trailing slashes', function() { + expect(OC.joinPaths('', 'abc/')).toEqual('abc/'); expect(OC.joinPaths('abc/')).toEqual('abc/'); + expect(OC.joinPaths('abc/', '')).toEqual('abc/'); expect(OC.joinPaths('abc', 'def/')).toEqual('abc/def/'); expect(OC.joinPaths('abc', 'def', 'ghi/')).toEqual('abc/def/ghi/'); }); |