Merge branch 'fix-me-me-me-me' into 'master'
Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji Steps to reproduce: 1. Go to a MR or issue 2. Click on "thumbsup" Emoji 3 times 3. Observe the tooltip becomes "me, me" Closes #13374, #12788 See merge request !2804
This commit is contained in:
commit
e654e68c3f
|
@ -1,6 +1,7 @@
|
||||||
Please view this file on the master branch, on stable branches it's out of date.
|
Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 8.5.0 (unreleased)
|
v 8.5.0 (unreleased)
|
||||||
|
- Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
|
||||||
- Cache various Repository methods to improve performance (Yorick Peterse)
|
- Cache various Repository methods to improve performance (Yorick Peterse)
|
||||||
- Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI (Stan Hu)
|
- Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI (Stan Hu)
|
||||||
- Ensure rake tasks that don't need a DB connection can be run without one
|
- Ensure rake tasks that don't need a DB connection can be run without one
|
||||||
|
|
|
@ -49,10 +49,11 @@ class @AwardsHandler
|
||||||
counter.text(parseInt(counter.text()) - 1)
|
counter.text(parseInt(counter.text()) - 1)
|
||||||
emojiIcon.removeClass("active")
|
emojiIcon.removeClass("active")
|
||||||
@removeMeFromAuthorList(emoji)
|
@removeMeFromAuthorList(emoji)
|
||||||
else if emoji =="thumbsup" || emoji == "thumbsdown"
|
else if emoji == "thumbsup" || emoji == "thumbsdown"
|
||||||
emojiIcon.tooltip("destroy")
|
emojiIcon.tooltip("destroy")
|
||||||
counter.text(0)
|
counter.text(0)
|
||||||
emojiIcon.removeClass("active")
|
emojiIcon.removeClass("active")
|
||||||
|
@removeMeFromAuthorList(emoji)
|
||||||
else
|
else
|
||||||
emojiIcon.tooltip("destroy")
|
emojiIcon.tooltip("destroy")
|
||||||
emojiIcon.remove()
|
emojiIcon.remove()
|
||||||
|
|
|
@ -7,7 +7,16 @@ Feature: Award Emoji
|
||||||
And I visit "Bugfix" issue page
|
And I visit "Bugfix" issue page
|
||||||
|
|
||||||
@javascript
|
@javascript
|
||||||
Scenario: I add and remove award in the issue
|
Scenario: I repeatedly add and remove thumbsup award in the issue
|
||||||
|
Given I click the thumbsup award Emoji
|
||||||
|
Then I have award added
|
||||||
|
Given I click the thumbsup award Emoji
|
||||||
|
Then I have no awards added
|
||||||
|
Given I click the thumbsup award Emoji
|
||||||
|
Then I have award added
|
||||||
|
|
||||||
|
@javascript
|
||||||
|
Scenario: I add and remove custom award in the issue
|
||||||
Given I click to emoji-picker
|
Given I click to emoji-picker
|
||||||
Then The search field is focused
|
Then The search field is focused
|
||||||
And I click to emoji in the picker
|
And I click to emoji in the picker
|
||||||
|
|
|
@ -8,6 +8,15 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
|
||||||
visit namespace_project_issue_path(@project.namespace, @project, @issue)
|
visit namespace_project_issue_path(@project.namespace, @project, @issue)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
step 'I click the thumbsup award Emoji' do
|
||||||
|
page.within '.awards' do
|
||||||
|
thumbsup = page.find('.award .emoji-1F44D')
|
||||||
|
thumbsup.click
|
||||||
|
thumbsup.hover
|
||||||
|
sleep 0.3
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
step 'I click to emoji-picker' do
|
step 'I click to emoji-picker' do
|
||||||
page.within '.awards-controls' do
|
page.within '.awards-controls' do
|
||||||
page.find('.add-award').click
|
page.find('.add-award').click
|
||||||
|
@ -40,6 +49,23 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
|
||||||
page.within '.awards' do
|
page.within '.awards' do
|
||||||
expect(page).to have_selector '.award'
|
expect(page).to have_selector '.award'
|
||||||
expect(page.find('.award.active .counter')).to have_content '1'
|
expect(page.find('.award.active .counter')).to have_content '1'
|
||||||
|
expect(page.find('.award.active')['data-original-title']).to eq('me')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
step 'I have no awards added' do
|
||||||
|
page.within '.awards' do
|
||||||
|
expect(page).to have_selector '.award'
|
||||||
|
expect(page.all('.award').size).to eq(2)
|
||||||
|
|
||||||
|
# Check tooltip data
|
||||||
|
page.all('.award').each do |element|
|
||||||
|
expect(element['title']).to eq("")
|
||||||
|
end
|
||||||
|
|
||||||
|
page.all('.award .counter').each do |element|
|
||||||
|
expect(element).to have_content '0'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue