diff options
author | Jack Davison <jack.davison@student.manchester.ac.uk> | 2016-06-23 20:02:11 +0100 |
---|---|---|
committer | Jack Davison <jack.davison@student.manchester.ac.uk> | 2016-08-17 21:25:39 +0100 |
commit | 1fc17a8a43a87af89358953364872d565d38b8e8 (patch) | |
tree | 5021b7c5ede713f48a38758c3bb965427cf87e70 /spec/helpers | |
parent | 4fbbb8e76550fcb8103cc1bf5c8536cf598db829 (diff) | |
download | gitlab-ce-1fc17a8a43a87af89358953364872d565d38b8e8.tar.gz |
Switch to using to_sentence to construct tooltips
* Code in ruby now uses Array#to_sentence to construct award tooltips
* Coffeescript uses a combination of regexes for the same result
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/issues_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb index c4281f8f591..e0e3554819c 100644 --- a/spec/helpers/issues_helper_spec.rb +++ b/spec/helpers/issues_helper_spec.rb @@ -66,7 +66,7 @@ describe IssuesHelper do let!(:awards) { build_list(:award_emoji, 15) } it "returns a comma seperated list of 1-9 users" do - expect(award_user_list(awards.first(9), nil)).to eq(awards.first(9).map { |a| a.user.name }.join(', ')) + expect(award_user_list(awards.first(9), nil)).to eq(awards.first(9).map { |a| a.user.name }.to_sentence) end it "displays the current user's name as 'me'" do |