Commit 29e5ae8c authored by Jose Ivan Vargas Lopez's avatar Jose Ivan Vargas Lopez Committed by Alfredo Sumaran

Fix usercallout to only show on the current logged in user profile

parent 6eeba4b1
...@@ -97,7 +97,8 @@ ...@@ -97,7 +97,8 @@
Snippets Snippets
%div{ class: container_class } %div{ class: container_class }
.user-callout{ 'callout-svg' => custom_icon('icon_customization') } - if @user == current_user
.user-callout{ 'callout-svg' => custom_icon('icon_customization') }
.tab-content .tab-content
#activity.tab-pane #activity.tab-pane
.row-content-block.calender-block.white.second-block.hidden-xs .row-content-block.calender-block.white.second-block.hidden-xs
......
---
title: User callout only shows on current users profile
merge_request:
author:
...@@ -2,6 +2,7 @@ require 'spec_helper' ...@@ -2,6 +2,7 @@ require 'spec_helper'
describe 'User Callouts', js: true do describe 'User Callouts', js: true do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:another_user) { create(:user) }
let(:project) { create(:empty_project, path: 'gitlab', name: 'sample') } let(:project) { create(:empty_project, path: 'gitlab', name: 'sample') }
before do before do
...@@ -32,6 +33,11 @@ describe 'User Callouts', js: true do ...@@ -32,6 +33,11 @@ describe 'User Callouts', js: true do
within('.user-callout') do within('.user-callout') do
find('.close-user-callout').click find('.close-user-callout').click
end end
expect(page).not_to have_selector('#user-callout') expect(page).not_to have_selector('.user-callout')
end
it 'does not show callout on another users profile' do
visit user_path(another_user)
expect(page).not_to have_selector('.user-callout')
end end
end end
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