summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-08-18 20:04:18 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-08-18 20:04:18 +0000
commit2b487edc98186e7f46c93ef7e6d029902aa82ebe (patch)
treee1626b042819065c871be10117a6d155553a8599 /features
parent4659a64b53d63841cb042ceee1d4d2b29c3336b8 (diff)
parentd548f3ee27fd12b4bafd36b0d6f2b9890ac383b4 (diff)
downloadgitlab-ce-2b487edc98186e7f46c93ef7e6d029902aa82ebe.tar.gz
Merge branch '18334-truncate-award-emoji-users' into 'master'
Truncated long user lists in award emoji tooltips ## What does this MR do? Truncates award emoji tooltips so that they only show 10 users maximum. Further users are indicated by appending "and X more." ## Are there points in the code the reviewer needs to double check? Is 10 too little, should it be raised? My test cases rely on join() to build the expected output. This feels a little iffy is it alright? ## Why was this MR needed? Some issues have a large number of thumbs causing tooltips to be very large. ## What are the relevant issue numbers? closes #18334, closes #19542 ## Screenshots (if relevant) ##### Before ![Screenshot_from_2016-06-20_19-49-12](/uploads/d7a14dd87bb3da2acd7c0818de99852b/Screenshot_from_2016-06-20_19-49-12.png) ##### After ![Screenshot_from_2016-06-20_19-50-58](/uploads/f7f05c44594bfe8cec7dfd48802753a6/Screenshot_from_2016-06-20_19-50-58.png) Truncation point modified for purposes of screenshot ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4780
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/issues/award_emoji.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 1498f899cf5..cbe5738e7e4 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -48,7 +48,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
page.within '.awards' do
expect(page).to have_selector '.js-emoji-btn'
expect(page.find('.js-emoji-btn.active .js-counter')).to have_content '1'
- expect(page).to have_css(".js-emoji-btn.active[data-original-title='me']")
+ expect(page).to have_css(".js-emoji-btn.active[data-original-title='You']")
end
end