From 57173a85a415903dae2796d287c7d70cdc27841d Mon Sep 17 00:00:00 2001 From: Ben Adida Date: Tue, 28 May 2019 23:30:08 -0700 Subject: [PATCH] a number of small changes to make the audio ballot work --- public/index.html | 2 +- ...ppEndToEndWithoutModuleSmartcards.test.tsx | 11 +- .../AppContestOvervote.test.tsx.snap | 31 +- src/__snapshots__/AppEndToEnd.test.tsx.snap | 512 +++++++++++++----- src/components/Breadcrumbs.tsx | 2 +- src/components/CandidateContest.tsx | 34 +- src/components/LinkButton.tsx | 1 + src/components/Modal.tsx | 11 +- src/components/Screen.tsx | 7 +- src/components/YesNoContest.tsx | 17 +- .../CandidateContest.test.tsx.snap | 72 ++- .../__snapshots__/LinkButton.test.tsx.snap | 4 + .../__snapshots__/YesNoContest.test.tsx.snap | 26 +- src/pages/CastBallotPage.tsx | 10 +- src/pages/ContestPage.tsx | 1 + src/pages/InstructionsPage.tsx | 10 +- src/pages/PreReviewPage.tsx | 10 +- src/pages/PrintPage.tsx | 18 +- src/pages/ReviewPage.tsx | 20 +- src/pages/StartPage.tsx | 11 +- .../CastBallotPage.test.tsx.snap | 7 + .../__snapshots__/ContestPage.test.tsx.snap | 31 +- .../__snapshots__/PreReviewPage.test.tsx.snap | 7 + .../__snapshots__/PrintPage.test.tsx.snap | 8 +- .../__snapshots__/ReviewPage.test.tsx.snap | 314 ++++++++--- .../__snapshots__/StartPage.test.tsx.snap | 6 +- 26 files changed, 843 insertions(+), 340 deletions(-) diff --git a/public/index.html b/public/index.html index c6cadee..ba2781c 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@ /> - VotingWorks Ballot Marking Device +
diff --git a/src/AppEndToEndWithoutModuleSmartcards.test.tsx b/src/AppEndToEndWithoutModuleSmartcards.test.tsx index 23af476..836db82 100644 --- a/src/AppEndToEndWithoutModuleSmartcards.test.tsx +++ b/src/AppEndToEndWithoutModuleSmartcards.test.tsx @@ -41,20 +41,21 @@ it(`quick end-to-end flow with absent module-smartcards`, async () => { // Go to First Contest fireEvent.click(getByText('Get Started')) + fireEvent.click(getByText('Start Voting')) // Go to Pre Review Screen - while (!queryByText('Pre Review Screen')) { + while (!queryByText('Review Your Selections')) { fireEvent.click(getByText('Next')) } - getByText('Pre Review Screen') + getByText('Review Your Selections') // Go to Review Screen - fireEvent.click(getByText('Next')) + fireEvent.click(getByText('Review Selections')) getByText('Review Your Ballot Selections') // Print Screen fireEvent.click(getByText('Next')) - getByText('Print your ballot') + getByText('Print your official ballot') // Test Print Ballot Modal fireEvent.click(getByText('Print Ballot')) @@ -66,5 +67,5 @@ it(`quick end-to-end flow with absent module-smartcards`, async () => { // Review and Cast Instructions // wait a little bit because the page transition is behind a setTimeout await sleep(100) - getByText('Verify and Cast Your Ballot') + getByText('Cast your printed ballot') }) diff --git a/src/__snapshots__/AppContestOvervote.test.tsx.snap b/src/__snapshots__/AppContestOvervote.test.tsx.snap index ef235a9..8fb00fe 100644 --- a/src/__snapshots__/AppContestOvervote.test.tsx.snap +++ b/src/__snapshots__/AppContestOvervote.test.tsx.snap @@ -470,9 +470,10 @@ button.c9 { >

President and Vice-President

-

+

Vote for 1 @@ -504,11 +507,10 @@ button.c9 { class="c7" >