diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-11-30 20:56:10 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-12-22 18:35:32 +0100 |
| commit | 14256d631cf32d8774c7fcffe322d65f964fcd5d (patch) | |
| tree | 871fc9174c2060060772ede82ac884d7980b98ff /core/js/tests/specs/sharedialogviewSpec.js | |
| parent | 453f3beffaf629efa5c715f7ca88b5c0a1034af8 (diff) | |
| download | nextcloud-server-14256d631cf32d8774c7fcffe322d65f964fcd5d.tar.gz nextcloud-server-14256d631cf32d8774c7fcffe322d65f964fcd5d.zip | |
Use group display name in sharing API + UI
Diffstat (limited to 'core/js/tests/specs/sharedialogviewSpec.js')
| -rw-r--r-- | core/js/tests/specs/sharedialogviewSpec.js | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js index 985610d51fb..cbb74714ff7 100644 --- a/core/js/tests/specs/sharedialogviewSpec.js +++ b/core/js/tests/specs/sharedialogviewSpec.js @@ -975,16 +975,35 @@ describe('OC.Share.ShareDialogView', function() { dialog.render(); expect(dialog.$el.find('.shareWithField').prop('disabled')).toEqual(true); }); - it('shows reshare owner', function() { + it('shows reshare owner for single user share', function() { shareModel.set({ reshare: { - uid_owner: 'user1' + uid_owner: 'user1', + displayname_owner: 'User One', + share_type: OC.Share.SHARE_TYPE_USER }, shares: [], permissions: OC.PERMISSION_READ }); dialog.render(); expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(1); + expect(dialog.$el.find('.resharerInfoView .reshare').text().trim()).toEqual('Shared with you by User One'); + }); + it('shows reshare owner for single user share', function() { + shareModel.set({ + reshare: { + uid_owner: 'user1', + displayname_owner: 'User One', + share_with: 'group2', + share_with_displayname: 'Group Two', + share_type: OC.Share.SHARE_TYPE_GROUP + }, + shares: [], + permissions: OC.PERMISSION_READ + }); + dialog.render(); + expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(1); + expect(dialog.$el.find('.resharerInfoView .reshare').text().trim()).toEqual('Shared with you and the group Group Two by User One'); }); it('does not show reshare owner if owner is current user', function() { shareModel.set({ |