From 3b2c9da7ccc557651a6a47b37e2677511319fbbb Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Wed, 1 Nov 2017 15:14:45 +0100
Subject: [PATCH] Adjust js tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
core/js/share.js | 13 ++++---
core/js/tests/specs/shareSpec.js | 58 ++++++++++++++++----------------
2 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/core/js/share.js b/core/js/share.js
index c629fb01da4..cae385f09b2 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -207,16 +207,15 @@ OC.Share = _.extend(OC.Share || {}, {
var parts = this._REMOTE_OWNER_REGEXP.exec(remoteAddress);
if (!parts) {
// display avatar of the user
- var avatar = '<span class="avatar" data-userName="' + escapeHTML(remoteAddress) + '" title="' + message + escapeHTML(remoteAddress) + '"></span>';
- var hidden = '<span class="hidden-visually">' + message + escapeHTML(remoteAddress) + '</span>';
+ var avatar = '<span class="avatar" data-userName="' + escapeHTML(remoteAddress) + '" title="' + message + " " + escapeHTML(remoteAddress) + '"></span>';
+ var hidden = '<span class="hidden-visually">' + message + " " + escapeHTML(remoteAddress) + '</span> ';
return avatar + hidden;
}
var userName = parts[1];
var userDomain = parts[3];
var server = parts[4];
- var dir = parts[6];
- var tooltip = userName;
+ var tooltip = message + " " + userName;
if (userDomain) {
tooltip += '@' + userDomain;
}
@@ -232,7 +231,7 @@ OC.Share = _.extend(OC.Share || {}, {
if (userDomain) {
html += '<span class="userDomain">@' + escapeHTML(userDomain) + '</span>';
}
- html += '</span>';
+ html += '</span> ';
return html;
},
/**
@@ -245,7 +244,7 @@ OC.Share = _.extend(OC.Share || {}, {
_formatShareList: function(recipients) {
var _parent = this;
return $.map(recipients, function(recipient) {
- recipient = _parent._formatRemoteShare(recipient, t('core', 'Shared with '));
+ recipient = _parent._formatRemoteShare(recipient, t('core', 'Shared with'));
return recipient;
});
},
@@ -298,7 +297,7 @@ OC.Share = _.extend(OC.Share || {}, {
avatars = '<span>' + t('core', 'Shared') + '</span>';
// even if reshared, only show "Shared by"
if (owner) {
- message = t('core', 'Shared by ');
+ message = t('core', 'Shared by');
avatars = this._formatRemoteShare(owner, message);
} else if (recipients) {
avatars = this._formatShareList(recipients.split(', ')).join('');
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index cef0d57fc6a..70c698c99a2 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -47,7 +47,7 @@ describe('OC.Share tests', function() {
$file.attr('data-share-owner', input);
OC.Share.markFileAsShared($file);
- $action = $file.find('.action-share>span');
+ $action = $file.find('.action-share>span').parent();
expect($action.text().trim()).toEqual(output);
if (_.isString(title)) {
expect($action.find('.remoteAddress').attr('title')).toEqual(title);
@@ -65,34 +65,34 @@ describe('OC.Share tests', function() {
checkOwner(
'User One@someserver.com',
'User One@…',
- 'User One@someserver.com'
+ 'Shared by User One@someserver.com'
);
checkOwner(
'User One@someserver.com/',
'User One@…',
- 'User One@someserver.com'
+ 'Shared by User One@someserver.com'
);
checkOwner(
'User One@someserver.com/root/of/owncloud',
'User One@…',
- 'User One@someserver.com'
+ 'Shared by User One@someserver.com'
);
});
it('displays the user name part with domain of a remote share owner', function() {
checkOwner(
'User One@example.com@someserver.com',
'User One@example.com',
- 'User One@example.com@someserver.com'
+ 'Shared by User One@example.com@someserver.com'
);
checkOwner(
'User One@example.com@someserver.com/',
'User One@example.com',
- 'User One@example.com@someserver.com'
+ 'Shared by User One@example.com@someserver.com'
);
checkOwner(
'User One@example.com@someserver.com/root/of/owncloud',
'User One@example.com',
- 'User One@example.com@someserver.com'
+ 'Shared by User One@example.com@someserver.com'
);
});
});
@@ -151,14 +151,14 @@ describe('OC.Share tests', function() {
});
});
- describe('displaying the recipoients', function() {
+ describe('displaying the recipients', function() {
function checkRecipients(input, output, title) {
var $action;
$file.attr('data-share-recipients', input);
OC.Share.markFileAsShared($file, true);
- $action = $file.find('.action-share>span');
+ $action = $file.find('.action-share>span').parent();
expect($action.text().trim()).toEqual(output);
if (_.isString(title)) {
expect($action.find('.remoteAddress').attr('title')).toEqual(title);
@@ -182,59 +182,59 @@ describe('OC.Share tests', function() {
it('displays the user name part of a remote recipient', function() {
checkRecipients(
'User One@someserver.com',
- 'Shared with User One@…',
- 'User One@someserver.com'
+ 'User One@…',
+ 'Shared with User One@someserver.com'
);
checkRecipients(
'User One@someserver.com/',
- 'Shared with User One@…',
- 'User One@someserver.com'
+ 'User One@…',
+ 'Shared with User One@someserver.com'
);
checkRecipients(
'User One@someserver.com/root/of/owncloud',
- 'Shared with User One@…',
- 'User One@someserver.com'
+ 'User One@…',
+ 'Shared with User One@someserver.com'
);
});
it('displays the user name part with domain of a remote share owner', function() {
checkRecipients(
'User One@example.com@someserver.com',
- 'Shared with User One@example.com',
- 'User One@example.com@someserver.com'
+ 'User One@example.com',
+ 'Shared with User One@example.com@someserver.com'
);
checkRecipients(
'User One@example.com@someserver.com/',
- 'Shared with User One@example.com',
- 'User One@example.com@someserver.com'
+ 'User One@example.com',
+ 'Shared with User One@example.com@someserver.com'
);
checkRecipients(
'User One@example.com@someserver.com/root/of/owncloud',
- 'Shared with User One@example.com',
- 'User One@example.com@someserver.com'
+ 'User One@example.com',
+ 'Shared with User One@example.com@someserver.com'
);
});
it('display multiple remote recipients', function() {
checkRecipients(
'One@someserver.com, two@otherserver.com',
- 'Shared with One@…, two@…',
- ['One@someserver.com', 'two@otherserver.com']
+ 'One@… two@…',
+ ['Shared with One@someserver.com', 'Shared with two@otherserver.com']
);
checkRecipients(
'One@someserver.com/, two@otherserver.com',
- 'Shared with One@…, two@…',
- ['One@someserver.com', 'two@otherserver.com']
+ 'One@… two@…',
+ ['Shared with One@someserver.com', 'Shared with two@otherserver.com']
);
checkRecipients(
'One@someserver.com/root/of/owncloud, two@otherserver.com',
- 'Shared with One@…, two@…',
- ['One@someserver.com', 'two@otherserver.com']
+ 'One@… two@…',
+ ['Shared with One@someserver.com', 'Shared with two@otherserver.com']
);
});
it('display mixed recipients', function() {
checkRecipients(
'One, two@otherserver.com',
- 'Shared with One, two@…',
- ['two@otherserver.com']
+ 'Shared with One two@…',
+ ['Shared with two@otherserver.com']
);
});
});
--
GitLab