adds user's email to activity page for admins
This commit is contained in:
@@ -35,4 +35,8 @@ module UsersHelper
|
||||
end
|
||||
end
|
||||
|
||||
def current_administrator?
|
||||
current_user && current_user.administrator?
|
||||
end
|
||||
|
||||
end
|
||||
@@ -2,7 +2,13 @@
|
||||
<div class="activity row">
|
||||
<div class="small-12 column">
|
||||
|
||||
<h2><%= avatar_image(@user, seed: @user.id, size: 60) %> <%= @user.name %></h2>
|
||||
<h2>
|
||||
<%= avatar_image(@user, seed: @user.id, size: 60) %>
|
||||
<%= @user.name %>
|
||||
<% if current_administrator? %>
|
||||
<small><%= @user.email %></small>
|
||||
<% end %>
|
||||
</h2>
|
||||
|
||||
<% if @user.public_activity || @authorized_current_user %>
|
||||
<dl class="sub-nav">
|
||||
|
||||
@@ -167,6 +167,38 @@ feature 'Users' do
|
||||
visit user_path(@user)
|
||||
expect(page).to_not have_content('activity list private')
|
||||
end
|
||||
|
||||
feature 'User email' do
|
||||
|
||||
background do
|
||||
@user = create(:user)
|
||||
end
|
||||
|
||||
scenario "is not shown if no user logged in" do
|
||||
visit user_path(@user)
|
||||
expect(page).to_not have_content(@user.email)
|
||||
end
|
||||
|
||||
scenario "is not shown if logged in user is a regular user" do
|
||||
login_as(create(:user))
|
||||
visit user_path(@user)
|
||||
expect(page).to_not have_content(@user.email)
|
||||
end
|
||||
|
||||
scenario "is not shown if logged in user is moderator" do
|
||||
login_as(create(:moderator).user)
|
||||
visit user_path(@user)
|
||||
expect(page).to_not have_content(@user.email)
|
||||
end
|
||||
|
||||
scenario "is shown if logged in user is admin" do
|
||||
login_as(create(:administrator).user)
|
||||
visit user_path(@user)
|
||||
expect(page).to have_content(@user.email)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
Reference in New Issue
Block a user