From 1b7d42c5691ffa21246022690f7688dda534c2dc Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 13 Jul 2015 10:57:52 +0200 Subject: Fix OC.joinPaths with empty arguments When empty arguments are given, the leading or trailing slash was not detected properly. --- core/js/tests/specs/coreSpec.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'core/js/tests') 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/'); }); -- cgit v1.2.3