do not display link to send direct message
This commit is contained in:
@@ -2,11 +2,11 @@
|
|||||||
<div class="activity row margin-top">
|
<div class="activity row margin-top">
|
||||||
<div class="small-12 column">
|
<div class="small-12 column">
|
||||||
|
|
||||||
<% if @user != current_user %> <!-- AND RECEIVE PRIVATE MESSAGES == TRUE -->
|
<% if @user != current_user && @user.email_on_direct_message? %>
|
||||||
<%= link_to t("users.show.send_private_message"),
|
<%= link_to t("users.show.send_private_message"),
|
||||||
new_user_direct_message_path(@user),
|
new_user_direct_message_path(@user),
|
||||||
class: "button hollow float-right" %>
|
class: "button hollow float-right" %>
|
||||||
<!-- ELSE -->
|
<% else %>
|
||||||
<div class="callout primary float-right">
|
<div class="callout primary float-right">
|
||||||
<%= t("users.show.no_private_messages") %>
|
<%= t("users.show.no_private_messages") %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ feature 'Direct messages' do
|
|||||||
|
|
||||||
context "Permissions" do
|
context "Permissions" do
|
||||||
|
|
||||||
scenario "Link to send the message" do
|
scenario "Do not display link to send message to myself" do
|
||||||
sender = create(:user, :level_two)
|
sender = create(:user, :level_two)
|
||||||
|
|
||||||
login_as(sender)
|
login_as(sender)
|
||||||
visit user_path(sender)
|
visit user_path(sender)
|
||||||
@@ -33,6 +33,17 @@ feature 'Direct messages' do
|
|||||||
expect(page).to_not have_link "Send private message"
|
expect(page).to_not have_link "Send private message"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
scenario "Do not display link if direct message for user not allowed" do
|
||||||
|
sender = create(:user, :level_two)
|
||||||
|
receiver = create(:user, :level_two, email_on_direct_message: false)
|
||||||
|
|
||||||
|
login_as(sender)
|
||||||
|
visit user_path(receiver)
|
||||||
|
|
||||||
|
expect(page).to have_content "This user doesn't accept private messages."
|
||||||
|
expect(page).to_not have_link "Send private message"
|
||||||
|
end
|
||||||
|
|
||||||
scenario "Accessing form directly" do
|
scenario "Accessing form directly" do
|
||||||
user = create(:user)
|
user = create(:user)
|
||||||
author = create(:user)
|
author = create(:user)
|
||||||
|
|||||||
Reference in New Issue
Block a user