Do not show flaggable and followable buttons on budgets_investment and proposals pages when user is not logged.
This commit is contained in:
committed by
Senén Rodero Rodríguez
parent
0ffa213a65
commit
97ee107157
@@ -13,10 +13,12 @@
|
|||||||
<%= l investment.created_at.to_date %>
|
<%= l investment.created_at.to_date %>
|
||||||
<span class="bullet"> • </span>
|
<span class="bullet"> • </span>
|
||||||
<%= investment.heading.name %>
|
<%= investment.heading.name %>
|
||||||
|
|
||||||
|
<% if current_user %>
|
||||||
<span class="bullet"> • </span>
|
<span class="bullet"> • </span>
|
||||||
<span class="js-follow">
|
|
||||||
<%= render 'follows/followable_button', followable: investment %>
|
<%= render 'follows/followable_button', followable: investment %>
|
||||||
</span>
|
<% end %>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
<span class="js-follow">
|
||||||
<span class="followable-content">
|
<span class="followable-content">
|
||||||
|
|
||||||
<% if show_follow_action? followable %>
|
<% if show_follow_action? followable %>
|
||||||
@@ -35,3 +36,4 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
</span>
|
</span>
|
||||||
|
</span>
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
<span class="js-flag-actions">
|
||||||
<span class="flag-content">
|
<span class="flag-content">
|
||||||
<% if show_flag_action? proposal %>
|
<% if show_flag_action? proposal %>
|
||||||
<a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
|
<a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
|
||||||
@@ -17,3 +18,4 @@
|
|||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
|
</span>
|
||||||
|
|||||||
@@ -49,14 +49,15 @@
|
|||||||
<span class="bullet"> • </span>
|
<span class="bullet"> • </span>
|
||||||
<span class="icon-comments"></span>
|
<span class="icon-comments"></span>
|
||||||
<%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
|
<%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
|
||||||
|
|
||||||
|
<% if current_user %>
|
||||||
<span class="bullet"> • </span>
|
<span class="bullet"> • </span>
|
||||||
<span class="js-flag-actions">
|
|
||||||
<%= render 'proposals/flag_actions', proposal: @proposal %>
|
<%= render 'proposals/flag_actions', proposal: @proposal %>
|
||||||
</span>
|
|
||||||
<span class="bullet"> • </span>
|
<span class="bullet"> • </span>
|
||||||
<span class="js-follow">
|
|
||||||
<%= render 'follows/followable_button', followable: @proposal %>
|
<%= render 'follows/followable_button', followable: @proposal %>
|
||||||
</span>
|
<% end %>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|||||||
@@ -329,6 +329,14 @@ feature 'Budget Investments' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
scenario "Not sow flaggable buttons" do
|
||||||
|
investment = create(:budget_investment, heading: heading)
|
||||||
|
|
||||||
|
visit budget_investment_path(budget_id: budget.id, id: investment.id)
|
||||||
|
|
||||||
|
expect(page).not_to have_selector ".js-follow"
|
||||||
|
end
|
||||||
|
|
||||||
scenario "Show back link contains heading id" do
|
scenario "Show back link contains heading id" do
|
||||||
investment = create(:budget_investment, heading: heading)
|
investment = create(:budget_investment, heading: heading)
|
||||||
visit budget_investment_path(budget, investment)
|
visit budget_investment_path(budget, investment)
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ feature 'Proposals' do
|
|||||||
expect(page).to have_content I18n.l(proposal.created_at.to_date)
|
expect(page).to have_content I18n.l(proposal.created_at.to_date)
|
||||||
expect(page).to have_selector(avatar(proposal.author.name))
|
expect(page).to have_selector(avatar(proposal.author.name))
|
||||||
expect(page.html).to include "<title>#{proposal.title}</title>"
|
expect(page.html).to include "<title>#{proposal.title}</title>"
|
||||||
|
expect(page).not_to have_selector ".js-flag-actions"
|
||||||
|
expect(page).not_to have_selector ".js-follow"
|
||||||
|
|
||||||
within('.social-share-button') do
|
within('.social-share-button') do
|
||||||
expect(page.all('a').count).to be(4) # Twitter, Facebook, Google+, Telegram
|
expect(page.all('a').count).to be(4) # Twitter, Facebook, Google+, Telegram
|
||||||
|
|||||||
Reference in New Issue
Block a user