summaryrefslogtreecommitdiffstats
path: root/core/js/tests
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-11-16 16:19:13 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-11-20 14:40:40 +0100
commit7a9ea03943767f048f4b121b0f4a435512bc13cf (patch)
tree7a2f4b0c6f2b27747f6dad6c6610aae4b486ebfe /core/js/tests
parentdef8af3e7e1f4328860f5c2d0c1643e0553f58e0 (diff)
downloadnextcloud-server-7a9ea03943767f048f4b121b0f4a435512bc13cf.tar.gz
nextcloud-server-7a9ea03943767f048f4b121b0f4a435512bc13cf.zip
Fix share link password input
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/js/tests')
-rw-r--r--core/js/tests/specs/sharedialoglinkshareview.js2
-rw-r--r--core/js/tests/specs/sharedialogviewSpec.js10
2 files changed, 5 insertions, 7 deletions
diff --git a/core/js/tests/specs/sharedialoglinkshareview.js b/core/js/tests/specs/sharedialoglinkshareview.js
index c2d84fd2e87..0272b07297e 100644
--- a/core/js/tests/specs/sharedialoglinkshareview.js
+++ b/core/js/tests/specs/sharedialoglinkshareview.js
@@ -186,13 +186,11 @@ describe('OC.Share.ShareDialogLinkShareView', function () {
});
view.render();
- var $passwordDiv = view.$el.find('#linkPass');
$passwordText = view.$el.find('.linkPassText');
$workingIcon = view.$el.find('.linkPassMenu .icon-loading-small');
sinon.stub(shareModel, 'saveLinkShare');
- expect($passwordDiv.hasClass('hidden')).toBeFalsy();
expect($passwordText.hasClass('hidden')).toBeFalsy();
expect($workingIcon.hasClass('hidden')).toBeTruthy();
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index 8d5a2ae434d..83ec459dc90 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -127,7 +127,7 @@ describe('OC.Share.ShareDialogView', function() {
describe('Share with link', function() {
// TODO: test ajax calls
// TODO: test password field visibility (whenever enforced or not)
- it('update password on focus out', function() {
+ it('update password on enter', function() {
$('#allowShareWithLink').val('yes');
dialog.model.set({
@@ -137,11 +137,11 @@ describe('OC.Share.ShareDialogView', function() {
});
dialog.render();
- // Enable password, enter password and focusout
+ // Enable password and enter password
dialog.$el.find('[name=showPassword]').click();
dialog.$el.find('.linkPassText').focus();
dialog.$el.find('.linkPassText').val('foo');
- dialog.$el.find('.linkPassText').focusout();
+ dialog.$el.find('.linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
expect(saveLinkShareStub.calledOnce).toEqual(true);
expect(saveLinkShareStub.firstCall.args[0]).toEqual({
@@ -149,7 +149,7 @@ describe('OC.Share.ShareDialogView', function() {
password: 'foo'
});
});
- it('update password on enter', function() {
+ it('update password on submit', function() {
$('#allowShareWithLink').val('yes');
dialog.model.set({
@@ -163,7 +163,7 @@ describe('OC.Share.ShareDialogView', function() {
dialog.$el.find('[name=showPassword]').click();
dialog.$el.find('.linkPassText').focus();
dialog.$el.find('.linkPassText').val('foo');
- dialog.$el.find('.linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+ dialog.$el.find('.linkPassText + .icon-confirm').click();
expect(saveLinkShareStub.calledOnce).toEqual(true);
expect(saveLinkShareStub.firstCall.args[0]).toEqual({