Do not remove linkshare if there is none
If the password is enforced we can't create a link share right away but just show the password field. Untoggling the link sharing should not try to remove the share. * Added unit test
This commit is contained in:
parent
cf9fb034c4
commit
8c459a895d
|
@ -124,7 +124,11 @@
|
|||
this.$el.find('#linkPassText').focus();
|
||||
}
|
||||
} else {
|
||||
if (this.model.get('linkShare').isLinkShare) {
|
||||
this.model.removeLinkShare();
|
||||
} else {
|
||||
this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
@ -231,6 +231,43 @@ describe('OC.Share.ShareDialogView', function() {
|
|||
expect(dialog.$el.find('#linkCheckbox').prop('checked')).toEqual(true);
|
||||
expect(dialog.$el.find('#linkText').val()).toEqual(link);
|
||||
});
|
||||
describe('password', function() {
|
||||
var slideToggleStub;
|
||||
|
||||
beforeEach(function() {
|
||||
$('#allowShareWithLink').val('yes');
|
||||
configModel.set({
|
||||
enforcePasswordForPublicLink: false
|
||||
});
|
||||
|
||||
slideToggleStub = sinon.stub($.fn, 'slideToggle');
|
||||
});
|
||||
afterEach(function() {
|
||||
slideToggleStub.restore();
|
||||
});
|
||||
|
||||
it('enforced but toggled does not fire request', function() {
|
||||
configModel.set('enforcePasswordForPublicLink', true);
|
||||
dialog.render();
|
||||
|
||||
dialog.$el.find('[name=linkCheckbox]').click();
|
||||
|
||||
// The password linkPass field is shown (slideToggle is called).
|
||||
// No request is made yet
|
||||
expect(slideToggleStub.callCount).toEqual(1);
|
||||
expect(slideToggleStub.getCall(0).thisValue.eq(0).attr('id')).toEqual('linkPass');
|
||||
expect(fakeServer.requests.length).toEqual(0);
|
||||
|
||||
// Now untoggle share by link
|
||||
dialog.$el.find('[name=linkCheckbox]').click();
|
||||
dialog.render();
|
||||
|
||||
// Password field disappears and no ajax requests have been made
|
||||
expect(fakeServer.requests.length).toEqual(0);
|
||||
expect(slideToggleStub.callCount).toEqual(2);
|
||||
expect(slideToggleStub.getCall(1).thisValue.eq(0).attr('id')).toEqual('linkPass');
|
||||
});
|
||||
});
|
||||
describe('expiration date', function() {
|
||||
var shareData;
|
||||
var shareItem;
|
||||
|
|
Loading…
Reference in New Issue