mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15870 from rullzer/fix_15812 

Reset share dialog values - more
This commit is contained in:
Morris Jobke 2015-05-18 11:24:42 +02:00
parent 73a3086945 b090a32d23
commit 8543b21d18
2 changed files with 111 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/js/share.js
View File

@ -986,6 +986,11 @@ $(document).ready(function() {
$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link')); $('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
// Reset link // Reset link
$('#linkText').val(''); $('#linkText').val('');
$('#showPassword').prop('checked', false);
$('#linkPass').hide();
$('#sharingDialogAllowPublicUpload').prop('checked', false);
$('#expirationCheckbox').prop('checked', false);
$('#expirationDate').hide();
var expireDateString = ''; var expireDateString = '';
if (oc_appconfig.core.defaultExpireDateEnabled) { if (oc_appconfig.core.defaultExpireDateEnabled) {
var date = new Date().getTime(); var date = new Date().getTime();

106
core/js/tests/specs/shareSpec.js
View File

@ -228,6 +228,112 @@ describe('OC.Share tests', function() {
oc_appconfig.core.enforcePasswordForPublicLink = old; oc_appconfig.core.enforcePasswordForPublicLink = old;
}); });
it('reset password on toggle of share', function() {
$('#allowShareWithLink').val('yes');
OC.Share.showDropDown(
'file',
123,
$container,
true,
31,
'shared_file_name.txt'
);
$('#dropdown [name=linkCheckbox]').click();
fakeServer.requests[0].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({data: {token: 'xyz'}, status: 'success'})
);
//Password protection should be unchecked and password field not visible
expect($('#dropdown [name=showPassword]').prop('checked')).toEqual(false);
expect($('#dropdown #linkPass').is(":visible")).toEqual(false);
// Toggle and set password
$('#dropdown [name=showPassword]').click();
$('#dropdown #linkPassText').val('foo');
$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
fakeServer.requests[1].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
);
// Unshare
$('#dropdown [name=linkCheckbox]').click();
fakeServer.requests[2].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({status: 'success'})
);
// Toggle share again
$('#dropdown [name=linkCheckbox]').click();
fakeServer.requests[3].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
);
// Password checkbox should be unchecked
expect($('#dropdown [name=showPassword]').prop('checked')).toEqual(false);
expect($('#dropdown #linkPass').is(":visible")).toEqual(false);
});
it('reset expiration on toggle of share', function() {
$('#allowShareWithLink').val('yes');
OC.Share.showDropDown(
'file',
123,
$container,
true,
31,
'shared_file_name.txt'
);
$('#dropdown [name=linkCheckbox]').click();
fakeServer.requests[0].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({data: {token: 'xyz'}, status: 'success'})
);
//Expiration should be unchecked and expiration field not visible
expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
expect($('#dropdown #expirationDate').is(":visible")).toEqual(false);
// Toggle and set password
$('#dropdown [name=expirationCheckbox]').click();
d = new Date();
d.setDate(d.getDate() + 1);
date=d.getDate() + '-' + (d.getMonth()+1) + '-' + d.getFullYear();
$('#dropdown #expirationDate').val(date);
$('#dropdown #expirationDate').change();
fakeServer.requests[1].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
);
// Unshare
$('#dropdown [name=linkCheckbox]').click();
fakeServer.requests[2].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({status: 'success'})
);
// Toggle share again
$('#dropdown [name=linkCheckbox]').click();
fakeServer.requests[3].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
);
// Recheck expire visibility
expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
expect($('#dropdown #expirationDate').is(":visible")).toEqual(false);
});
it('shows populated link share when a link share exists', function() { it('shows populated link share when a link share exists', function() {
loadItemStub.returns({ loadItemStub.returns({
reshare: [], reshare: [],