From 134192d76cf27bee9549710a1eac40db3ef1edf1 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 24 Nov 2017 15:33:26 +0100 Subject: fix sorting test on phantomjs Signed-off-by: Arthur Schiwon --- core/js/tests/specs/shareSpec.js | 44 ++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 15 deletions(-) (limited to 'core/js') diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js index 399911c3d54..05057692e98 100644 --- a/core/js/tests/specs/shareSpec.js +++ b/core/js/tests/specs/shareSpec.js @@ -327,22 +327,36 @@ describe('OC.Share tests', function() { ); }); it('display multiple with divergent displaynames', function() { - checkRecipients( - { - 0: { - shareWith: 'One', - shareWithDisplayName: 'Yoko Ono' - }, - 1: { - shareWith: 'two@otherserver.com', - shareWithDisplayName: 'two@othererver.com' - }, - 2: { - shareWith: 'Three', - shareWithDisplayName: 'Green, Mina' - } + var recipients = { + 0: { + shareWith: 'One', + shareWithDisplayName: 'Yoko Ono', + _output: 'Shared with Yoko Ono' }, - 'Shared with Green, Mina two@… Shared with Yoko Ono', + 1: { + shareWith: 'two@otherserver.com', + shareWithDisplayName: 'two@othererver.com', + _output: 'two@…' + }, + 2: { + shareWith: 'Three', + shareWithDisplayName: 'Green, Mina', + _output: 'Shared with Green, Mina' + } + }; + + // we cannot assume the locale, also because PhantomJS has a bug. + var sortArray = _.toArray(recipients) + .sort(function(a, b) { + return a.shareWithDisplayName.localeCompare(b.shareWithDisplayName); + }); + var sortedOutput = _.map(sortArray, function(recipient) { + return recipient._output; + }).join(' '); + + checkRecipients( + recipients, + sortedOutput, ['Shared with two@otherserver.com'] ); }); -- cgit v1.2.3