consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes specs

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-12-07 18:16:09 +01:00
parent 99153cc589
commit 87e7e7e4ea
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/views/proposals/show.html.erb
View File

@@ -102,17 +102,21 @@
<aside class="small-12 medium-3 column"> <aside class="small-12 medium-3 column">
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2><%= t("votes.supports") %></h2> <h2><%= t("votes.supports") %></h2>
<div id="<%= dom_id(@proposal) %>_votes" class="supports text-center"> <div id="<%= dom_id(@proposal) %>_votes">
<% if @proposal.successfull? %> <% if @proposal.successfull? %>
<p> <div class="padding text-center">
<%= t("proposal_ballots.successfull", <p>
voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %> <%= t("proposal_ballots.successfull",
</p> voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
</p>
</div>
<% elsif @proposal.archived? %> <% elsif @proposal.archived? %>
<p> <div class="padding text-center">
<strong><%= t("proposals.proposal.supports", count: @proposal.total_votes) %></strong> <p>
</p> <strong><%= t("proposals.proposal.supports", count: @proposal.total_votes) %></strong>
<p><%= t("proposals.proposal.archived") %></p> </p>
<p><%= t("proposals.proposal.archived") %></p>
</div>
<% else %> <% else %>
<%= render 'votes', <%= render 'votes',
{ proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %> { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %>

4
spec/support/common_actions.rb
View File

@@ -156,7 +156,7 @@ module CommonActions
def expect_message_you_need_to_sign_in def expect_message_you_need_to_sign_in
expect(page).to have_content 'You must Sign in or Sign up to continue' expect(page).to have_content 'You must Sign in or Sign up to continue'
expect(page).to have_selector('.in-favor a', visible: false) expect(page).to have_selector('.in-favor', visible: false)
end end
def expect_message_you_need_to_sign_in_to_vote_comments def expect_message_you_need_to_sign_in_to_vote_comments
@@ -172,7 +172,7 @@ module CommonActions
def expect_message_only_verified_can_vote_proposals def expect_message_only_verified_can_vote_proposals
expect(page).to have_content 'Only verified users can vote on proposals' expect(page).to have_content 'Only verified users can vote on proposals'
expect(page).to have_selector('.in-favor a', visible: false) expect(page).to have_selector('.in-favor', visible: false)
end end
def expect_message_voting_not_allowed def expect_message_voting_not_allowed