summaryrefslogtreecommitdiffstats
path: root/apps/files/tests
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-06 16:13:39 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-06 17:00:22 +0200
commit254576e1f7f5ec610ddbd9de81005397191cf52f (patch)
tree514fdb766d105eada395da5f883fdc520c23eec3 /apps/files/tests
parentcaefe23bb610308324d9436dd7c1e109118062eb (diff)
downloadnextcloud-server-254576e1f7f5ec610ddbd9de81005397191cf52f.tar.gz
nextcloud-server-254576e1f7f5ec610ddbd9de81005397191cf52f.zip
Do not encode slashes in "dir" URL param in files JS
Diffstat (limited to 'apps/files/tests')
-rw-r--r--apps/files/tests/js/appSpec.js32
1 files changed, 18 insertions, 14 deletions
diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js
index 3070d687fc5..b9c323e7c12 100644
--- a/apps/files/tests/js/appSpec.js
+++ b/apps/files/tests/js/appSpec.js
@@ -122,35 +122,39 @@ describe('OCA.Files.App tests', function() {
describe('URL handling', function() {
it('pushes the state to the URL when current app changed directory', function() {
- $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+ $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'sub dir'}));
expect(pushStateStub.calledOnce).toEqual(true);
- expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
- expect(pushStateStub.getCall(0).args[0].view).not.toBeDefined();
+ var params = OC.parseQueryString(pushStateStub.getCall(0).args[0]);
+ expect(params.dir).toEqual('sub dir');
+ expect(params.view).not.toBeDefined();
$('li[data-id=other]>a').click();
pushStateStub.reset();
- $('#app-content-other').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+ $('#app-content-other').trigger(new $.Event('changeDirectory', {dir: 'sub dir'}));
expect(pushStateStub.calledOnce).toEqual(true);
- expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
- expect(pushStateStub.getCall(0).args[0].view).toEqual('other');
+ params = OC.parseQueryString(pushStateStub.getCall(0).args[0]);
+ expect(params.dir).toEqual('sub dir');
+ expect(params.view).toEqual('other');
});
it('replaces the state to the URL when fileid is known', function() {
- $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+ $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'sub dir'}));
expect(pushStateStub.calledOnce).toEqual(true);
- expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
- expect(pushStateStub.getCall(0).args[0].view).not.toBeDefined();
+ var params = OC.parseQueryString(pushStateStub.getCall(0).args[0]);
+ expect(params.dir).toEqual('sub dir');
+ expect(params.view).not.toBeDefined();
expect(replaceStateStub.notCalled).toEqual(true);
- parseUrlQueryStub.returns({dir: 'subdir'});
+ parseUrlQueryStub.returns({dir: 'sub dir'});
- $('#app-content-files').trigger(new $.Event('afterChangeDirectory', {dir: 'subdir', fileId: 123}));
+ $('#app-content-files').trigger(new $.Event('afterChangeDirectory', {dir: 'sub dir', fileId: 123}));
expect(pushStateStub.calledOnce).toEqual(true);
expect(replaceStateStub.calledOnce).toEqual(true);
- expect(replaceStateStub.getCall(0).args[0].dir).toEqual('subdir');
- expect(replaceStateStub.getCall(0).args[0].view).not.toBeDefined();
- expect(replaceStateStub.getCall(0).args[0].fileid).toEqual(123);
+ params = OC.parseQueryString(replaceStateStub.getCall(0).args[0]);
+ expect(params.dir).toEqual('sub dir');
+ expect(params.view).not.toBeDefined();
+ expect(params.fileid).toEqual('123');
});
describe('onpopstate', function() {
it('sends "urlChanged" event to current app', function() {