Commit c3f858b7 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'emoji-btn-disabled' into 'master'

Disabled award emoji button when user is not logged in

## What does this MR do?

The award emoji buttons are now disabled when the user is not signed in, stopping them from clicking it & then getting an error.

## Screenshots (if relevant)

![Screen_Shot_2016-11-22_at_10.25.20](/uploads/210378bde90e689fbc12940ce271c05e/Screen_Shot_2016-11-22_at_10.25.20.png)

## What are the relevant issue numbers?

Closes #24680

See merge request !7651
parents 3cefaca2 9d3186e4
- grouped_emojis = awardable.grouped_awards(with_thumbs: inline)
.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: toggle_award_url(awardable) } }
- awards_sort(grouped_emojis).each do |emoji, awards|
%button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), data: { placement: "bottom", title: award_user_list(awards, current_user) } }
%button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button",
disabled: !current_user,
class: (award_active_class(awards, current_user)),
data: { placement: "bottom", title: award_user_list(awards, current_user) } }
= emoji_icon(emoji, sprite: false)
%span.award-control-text.js-counter
= awards.count
......
---
title: Disabled emoji buttons when user is not logged in
merge_request:
author:
......@@ -3,21 +3,21 @@ require 'rails_helper'
describe 'Awards Emoji', feature: true do
include WaitForAjax
let!(:project) { create(:project) }
let!(:project) { create(:project, :public) }
let!(:user) { create(:user) }
let(:issue) do
create(:issue,
assignee: @user,
project: project)
end
context 'authorized user' do
before do
project.team << [user, :master]
login_as(user)
end
describe 'Click award emoji from issue#show' do
let!(:issue) do
create(:issue,
assignee: @user,
project: project)
end
let!(:note) { create(:note_on_issue, noteable: issue, project: issue.project, note: "Hello world") }
before do
......@@ -68,6 +68,17 @@ describe 'Awards Emoji', feature: true do
end
end
end
end
context 'unauthorized user', js: true do
before do
visit namespace_project_issue_path(project.namespace, project, issue)
end
it 'has disabled emoji button' do
expect(first('.award-control')[:disabled]).to be(true)
end
end
def thumbsup_emoji
page.all(emoji_counter).first
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment