From 1de763a737e017ac0976fc0d9e3ffc7704d862ac Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 6 Sep 2017 18:07:46 +0200 Subject: [PATCH 1/2] removes deprecated specs --- spec/models/poll/poll_spec.rb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb index 2eb78841b..ac0cc44ea 100644 --- a/spec/models/poll/poll_spec.rb +++ b/spec/models/poll/poll_spec.rb @@ -67,31 +67,15 @@ describe :poll do current = create(:poll, :current) incoming = create(:poll, :incoming) expired = create(:poll, :expired) - + current_or_incoming = Poll.current_or_incoming - + expect(current_or_incoming).to include(current) expect(current_or_incoming).to include(incoming) expect(current_or_incoming).to_not include(expired) end end - describe "#document_has_voted?" do - it "returns true if Poll::Voter with document exists" do - poll = create(:poll) - voter = create(:poll_voter, :valid_document, poll: poll) - - expect(poll.document_has_voted?(voter.document_number, voter.document_type)).to eq(true) - end - - it "returns false if Poll::Voter with document does not exists" do - poll_2 = create(:poll) - voter = create(:poll_voter, :valid_document, poll: poll_2) - - expect(poll.document_has_voted?(voter.document_number, voter.document_type)).to eq(false) - end - end - describe "answerable_by" do let(:geozone) {create(:geozone) } From 2a389dbb5586469e77e1f24f822618b182329eb5 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 6 Sep 2017 18:08:29 +0200 Subject: [PATCH 2/2] removes unnecessary html tag --- app/views/polls/index.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb index 55cdae8e2..a0673ada6 100644 --- a/app/views/polls/index.html.erb +++ b/app/views/polls/index.html.erb @@ -30,7 +30,6 @@

<%= t("polls.index.section_footer.help_text_1") %>

<%= t("polls.index.section_footer.help_text_2", org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

-