diff --git a/ynr/apps/elections/templates/elections/ballot_view.html b/ynr/apps/elections/templates/elections/ballot_view.html index 291029124..341b6d04d 100644 --- a/ynr/apps/elections/templates/elections/ballot_view.html +++ b/ynr/apps/elections/templates/elections/ballot_view.html @@ -57,9 +57,9 @@

Candidates for {{ ballot.post.label }} on
{{ ballot.election.election_da {% if not ballot.candidates_locked and candidates.exists %}
-

These {{ ballot.num_candidates }} candidates haven't been confirmed by the official "nomination papers" - from the council yet. This means they might not all end up on the ballot paper.

-

We will manually verify each candidate when the nomination papers are published.

+

These candidates will not be confirmed until the council publishes the official candidate list on {{ballot.expected_sopn_date}}. + Once nomination papers are published, we will manually verify each candidate. +

{% endif %} diff --git a/ynr/apps/elections/tests/test_ballot_view.py b/ynr/apps/elections/tests/test_ballot_view.py index fc2eb2fd1..23c32a99b 100644 --- a/ynr/apps/elections/tests/test_ballot_view.py +++ b/ynr/apps/elections/tests/test_ballot_view.py @@ -1,3 +1,4 @@ +import datetime from random import randrange from candidates.models import PartySet @@ -125,34 +126,47 @@ def test_ballot_sopn_upload_link(self): ) def test_ballot_with_candidates_no_sopn(self): + self.election.election_date = datetime.date(2019, 8, 3) + self.election.save() + self.ballot.post.territory_code = "ENG" + self.ballot.save() self.create_memberships(self.ballot, self.parties) + response = self.app.get(self.ballot.get_absolute_url()) + self.assertEqual( + self.ballot.expected_sopn_date, datetime.date(2019, 7, 10) + ) + self.assertFalse(self.ballot.candidates_locked) self.assertEqual(response.context["candidates"].count(), 9) self.assertDataTimelineCandidateAddingInProgress(response) + expected_header = """ +

Candidates for Bar Ward on
3 August 2019

+ """ self.assertInHTML( - f"

Candidates for Bar Ward on
{ self.election.election_date.strftime('%d %B %Y') }

", + expected_header, response.text, ) - self.assertInHTML( - """ + expected_notice = """

- These 9 candidates haven't been confirmed by the official - "nomination papers" from the council yet. This means they might - not all end up on the ballot paper. + These candidates will not be confirmed until the council publishes the official candidate list on 10 July 2019. + Once nomination papers are published, we will manually verify each candidate.

- """, + """ + self.assertInHTML( + expected_notice, response.text, ) - self.assertInHTML( - """ + expected_table = """ Name Party - """, + """ + self.assertInHTML( + expected_table, response.text, )