kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '52888-status-emoji-should-not-be-added-to-awards-section-on-issue-page-2' into 'master'

Browse source 
Resolve "Status emoji should not update awards section on issue page"

Closes #52888

See merge request gitlab-org/gitlab-ce!23470
This commit is contained in:
Fatih Acet 2018-12-31 13:58:20 +00:00
commit 4d799818aa
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js
View file

@ -12,9 +12,8 @@ class EmojiMenuInModal extends AwardsHandler {
this.bindEvents();
}
postEmoji($emojiButton, awardUrl, selectedEmoji, callback) {
postEmoji($emojiButton, awardUrl, selectedEmoji) {
this.selectEmojiCallback(selectedEmoji, this.emoji.glEmojiTag(selectedEmoji));
callback();
}
}

5
changelogs/unreleased/52888-status-emoji-should-not-be-added-to-awards-section-on-issue-page-2.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Prevent awards emoji being updated when updating status
merge_request: 23470
author:
type: fixed

14
spec/features/profiles/user_edit_profile_spec.rb
View file

@ -147,6 +147,9 @@ describe 'User edit profile' do
end
context 'user menu' do
let(:issue) { create(:issue, project: project)}
let(:project) { create(:project) }
def open_user_status_modal
find('.header-user-dropdown-toggle').click
@ -205,6 +208,17 @@ describe 'User edit profile' do
end
end
it 'does not update the awards panel emoji' do
project.add_maintainer(user)
visit(project_issue_path(project, issue))
emoji = 'biohazard'
open_user_status_modal
select_emoji(emoji, true)
expect(page.all('.award-control .js-counter')).to all(have_content('0'))
end
it 'adds message to user status' do
message = 'I have something to say'
open_user_status_modal