fix rest of tests

votingworks · Oct 10, 2023 · 22abecd · 22abecd
1 parent 0bb3947
commit 22abecd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/apps/mark-scan/frontend/src/app_cardless_voting.test.tsx b/apps/mark-scan/frontend/src/app_cardless_voting.test.tsx
@@ -17,7 +17,6 @@ import {
   screen,
   within,
 } from '../test/react_testing_library';
-import * as GLOBALS from './config/globals';
 
 import { App } from './app';
 
@@ -258,16 +257,9 @@ test('Cardless Voting Flow', async () => {
   apiMock.expectGetInterpretation(mockInterpretation);
   userEvent.click(screen.getByText('My Ballot is Correct'));
 
-  // Reset Ballot is called
-  // Show Verify and Scan Instructions
-  await screen.findByText('You’re Almost Done');
-  expect(
-    screen.queryByText('3. Return the card to a poll worker.')
-  ).toBeFalsy();
+  apiMock.setPaperHandlerState('ejecting_to_rear');
+  await screen.findByText('Casting Ballot');
 
-  // Wait for timeout to return to Insert Card screen
-  apiMock.mockApiClient.endCardlessVoterSession.expectCallWith().resolves();
-  await advanceTimersAndPromises(GLOBALS.BALLOT_INSTRUCTIONS_TIMEOUT_SECONDS);
   apiMock.setAuthStatusLoggedOut();
   await screen.findByText('Insert Card');
 });
@@ -412,14 +404,9 @@ test('Voter can submit a blank ballot', async () => {
   apiMock.expectGetInterpretation(mockInterpretation);
   userEvent.click(screen.getByText('My Ballot is Correct'));
 
-  // Reset Ballot is called
-  // Show Verify and Scan Instructions
-  await screen.findByText('You’re Almost Done');
-  expect(screen.queryByText('3. Return the card.')).toBeFalsy();
+  apiMock.setPaperHandlerState('ejecting_to_rear');
+  await screen.findByText('Casting Ballot');
 
-  // Click "Done" to get back to Insert Card screen
-  apiMock.mockApiClient.endCardlessVoterSession.expectCallWith().resolves();
-  fireEvent.click(screen.getByText('Done'));
   apiMock.setAuthStatusLoggedOut();
   await screen.findByText('Insert Card');
 });
@@ -636,16 +623,9 @@ test('poll worker must select a precinct first', async () => {
   apiMock.expectGetInterpretation(mockInterpretation);
   userEvent.click(screen.getByText('My Ballot is Correct'));
 
-  // Reset Ballot is called
-  // Show Verify and Scan Instructions
-  await screen.findByText('You’re Almost Done');
-  expect(
-    screen.queryByText('3. Return the card to a poll worker.')
-  ).toBeFalsy();
+  apiMock.setPaperHandlerState('ejecting_to_rear');
+  await screen.findByText('Casting Ballot');
 
-  // Wait for timeout to return to Insert Card screen
-  apiMock.mockApiClient.endCardlessVoterSession.expectCallWith().resolves();
-  await advanceTimersAndPromises(GLOBALS.BALLOT_INSTRUCTIONS_TIMEOUT_SECONDS);
   apiMock.setAuthStatusLoggedOut();
   await screen.findByText('Insert Card');
 });
diff --git a/apps/mark-scan/frontend/src/app_end_to_end.test.tsx b/apps/mark-scan/frontend/src/app_end_to_end.test.tsx
@@ -293,10 +293,9 @@ test('MarkAndPrint end-to-end flow', async () => {
   // Validate Ballot page
   await screen.findByText('Review Your Votes');
   apiMock.expectValidateBallot();
-  apiMock.mockApiClient.endCardlessVoterSession.expectCallWith().resolves();
   apiMock.expectGetInterpretation(mockInterpretation);
   userEvent.click(screen.getByText('My Ballot is Correct'));
-  userEvent.click(await screen.findByText('Done'));
+
   apiMock.setAuthStatusLoggedOut();
 
   // ---------------