@@ -4,7 +4,6 @@ import { assertHasFooter, assertHasNavBar, initI18n, logIn, setUp } from './shar
44import {
55 SCIPER_ADMIN ,
66 SCIPER_OTHER_ADMIN ,
7- SCIPER_OTHER_USER ,
87 SCIPER_USER ,
98 mockDKGActors as mockAPIDKGActors ,
109 mockAddRole ,
@@ -49,7 +48,7 @@ async function setUpMocks(
4948 }
5049 await mockDKGActors ( page , dkgActorsStatus , initialized ) ;
5150 await mockAPIDKGActors ( page ) ;
52- await mockPersonalInfo ( page ) ;
51+ await mockPersonalInfo ( page , SCIPER_ADMIN ) ; // initially log in as admin to be able to access page
5352 await mockDKGActorsFormID ( page ) ;
5453 await mockServicesShuffle ( page ) ;
5554 await mockForms ( page ) ;
@@ -70,13 +69,6 @@ test('Assert footer is present', async ({ page }) => {
7069} ) ;
7170
7271async function assertIsOnlyVisibleToOwner ( page : Page , locator : Locator ) {
73- await test . step ( 'Assert is hidden to unauthenticated user' , async ( ) => {
74- await expect ( locator ) . toBeHidden ( ) ;
75- } ) ;
76- await test . step ( 'Assert is hidden to authenticated non-admin user' , async ( ) => {
77- await logIn ( page , SCIPER_USER ) ;
78- await expect ( locator ) . toBeHidden ( ) ;
79- } ) ;
8072 await test . step ( 'Assert is hidden to non-owner admin' , async ( ) => {
8173 await logIn ( page , SCIPER_ADMIN ) ;
8274 await expect ( locator ) . toBeHidden ( ) ;
@@ -151,19 +143,16 @@ test('Assert "Add voters" button allows to add voters', async ({ page, baseURL }
151143 await setUpMocks ( page , 0 , 6 ) ;
152144 await mockAddRole ( page ) ;
153145 await logIn ( page , SCIPER_OTHER_ADMIN ) ;
154- // we expect one call per new voter
155- for ( const sciper of [ SCIPER_OTHER_ADMIN , SCIPER_ADMIN , SCIPER_USER ] ) {
156- page . waitForRequest ( async ( request ) => {
157- const body = await request . postDataJSON ( ) ;
158- return (
159- request . url ( ) === `${ baseURL } /api/add_role` &&
160- request . method ( ) === 'POST' &&
161- body . permission === 'vote' &&
162- body . subject === FORMID &&
163- body . userId . toString ( ) === sciper
164- ) ;
165- } ) ;
166- }
146+ page . waitForRequest ( async ( request ) => {
147+ const body = await request . postDataJSON ( ) ;
148+ return (
149+ request . url ( ) === `${ baseURL } /api/add_role` &&
150+ request . method ( ) === 'POST' &&
151+ body . permission === 'vote' &&
152+ body . subject === FORMID &&
153+ body . userIds . toString ( ) === [ SCIPER_OTHER_ADMIN , SCIPER_ADMIN , SCIPER_USER ] . join ( ',' )
154+ ) ;
155+ } ) ;
167156 await page . getByTestId ( 'addVotersButton' ) . click ( ) ;
168157 // menu should be visible
169158 const textbox = await page . getByRole ( 'textbox' , { name : 'SCIPERs' } ) ;
@@ -388,17 +377,6 @@ test('Assert "Vote" button is visible to admin/non-admin voter user', async ({ p
388377 [ 1 ] ,
389378 // eslint-disable-next-line @typescript-eslint/no-shadow
390379 async function ( page : Page , locator : Locator ) {
391- await test . step ( 'Assert is hidden to unauthenticated user' , async ( ) => {
392- await expect ( locator ) . toBeHidden ( ) ;
393- } ) ;
394- await test . step ( 'Assert is hidden to authenticated non-voter user' , async ( ) => {
395- await logIn ( page , SCIPER_OTHER_USER ) ;
396- await expect ( locator ) . toBeHidden ( ) ;
397- } ) ;
398- await test . step ( 'Assert is visible to authenticated voter user' , async ( ) => {
399- await logIn ( page , SCIPER_USER ) ;
400- await expect ( locator ) . toBeVisible ( ) ;
401- } ) ;
402380 await test . step ( 'Assert is hidden to non-voter admin' , async ( ) => {
403381 await logIn ( page , SCIPER_OTHER_ADMIN ) ;
404382 await expect ( locator ) . toBeHidden ( ) ;
@@ -413,11 +391,6 @@ test('Assert "Vote" button is visible to admin/non-admin voter user', async ({ p
413391
414392test ( 'Assert "Vote" button gets voting form' , async ( { page } ) => {
415393 await setUpMocks ( page , 1 , 6 ) ;
416- await logIn ( page , SCIPER_USER ) ;
417- page . waitForRequest ( `${ process . env . DELA_PROXY_URL } /evoting/forms/${ FORMID } ` ) ;
418- await page . getByRole ( 'button' , { name : i18n . t ( 'vote' ) } ) . click ( ) ;
419- // go back to form management page
420- await setUp ( page , `/forms/${ FORMID } ` ) ;
421394 await logIn ( page , SCIPER_ADMIN ) ;
422395 page . waitForRequest ( `${ process . env . DELA_PROXY_URL } /evoting/forms/${ FORMID } ` ) ;
423396 await page . getByRole ( 'button' , { name : i18n . t ( 'vote' ) } ) . click ( ) ;
0 commit comments