@@ -5,43 +5,30 @@ import {
55} from 'helpers/auth/cognito-auth-helper' ;
66import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory' ;
77import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper' ;
8- import { test , expect } from 'fixtures/axe-test ' ;
8+ import { test } from 'fixtures/accessibility-analyze ' ;
99import {
1010 RoutingChooseMessageOrderPage ,
1111 RoutingCreateMessagePlanPage ,
1212 RoutingMessagePlanCampaignIdRequiredPage ,
1313 RoutingMessagePlansPage ,
1414} from 'pages/routing' ;
1515import { loginAsUser } from 'helpers/auth/login-as-user' ;
16- import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page' ;
17- import AxeBuilder from '@axe-core/playwright' ;
1816
1917let user : TestUser ;
2018let userWithMultipleCampaigns : TestUser ;
2119
2220const routingStorageHelper = new RoutingConfigStorageHelper ( ) ;
2321
24- async function run < T extends TemplateMgmtBasePage > (
25- page : T ,
26- makeAxeBuilder : ( ) => AxeBuilder ,
27- fn ?: ( page : T ) => Promise < void >
28- ) {
29- await page . loadPage ( ) ;
30- if ( fn ) {
31- await fn ( page ) ;
32- }
33- const results = await makeAxeBuilder ( ) . analyze ( ) ;
34- expect ( results . violations ) . toEqual ( [ ] ) ;
35- }
36-
3722test . describe ( 'Routing - Accessibility' , ( ) => {
3823 test . beforeAll ( async ( ) => {
3924 const authHelper = createAuthHelper ( ) ;
4025
4126 user = await authHelper . getTestUser ( testUsers . User1 . userId ) ;
27+
4228 userWithMultipleCampaigns = await authHelper . getTestUser (
4329 testUsers . UserWithMultipleCampaigns . userId
4430 ) ;
31+
4532 await routingStorageHelper . seed ( [
4633 RoutingConfigFactory . create ( user ) . dbEntry ,
4734 ] ) ;
@@ -51,42 +38,42 @@ test.describe('Routing - Accessibility', () => {
5138 await routingStorageHelper . deleteSeeded ( ) ;
5239 } ) ;
5340
54- test ( 'Message plans' , async ( { page, makeAxeBuilder } ) =>
55- run ( new RoutingMessagePlansPage ( page ) , makeAxeBuilder ) ) ;
41+ test ( 'Message plans' , async ( { page, analyze } ) =>
42+ analyze ( new RoutingMessagePlansPage ( page ) ) ) ;
5643
57- test ( 'Campaign required' , async ( { page, makeAxeBuilder } ) =>
58- run ( new RoutingMessagePlanCampaignIdRequiredPage ( page ) , makeAxeBuilder ) ) ;
44+ test ( 'Campaign required' , async ( { page, analyze } ) =>
45+ analyze ( new RoutingMessagePlanCampaignIdRequiredPage ( page ) ) ) ;
5946
60- test ( 'Choose message order' , async ( { page, makeAxeBuilder } ) =>
61- run ( new RoutingChooseMessageOrderPage ( page ) , makeAxeBuilder ) ) ;
47+ test ( 'Choose message order' , async ( { page, analyze } ) =>
48+ analyze ( new RoutingChooseMessageOrderPage ( page ) ) ) ;
6249
63- test ( 'Choose message order - error' , async ( { page, makeAxeBuilder } ) =>
64- run ( new RoutingChooseMessageOrderPage ( page ) , makeAxeBuilder , ( p ) =>
65- p . clickContinueButton ( )
66- ) ) ;
50+ test ( 'Choose message order - error' , async ( { page, analyze } ) =>
51+ analyze ( new RoutingChooseMessageOrderPage ( page ) , {
52+ beforeAnalyze : ( p ) => p . clickContinueButton ( ) ,
53+ } ) ) ;
6754
6855 test . describe ( 'client has multiple campaigns' , ( ) => {
56+ const messageOrder = 'NHSAPP,EMAIL,SMS,LETTER' ;
57+
6958 test . use ( { storageState : { cookies : [ ] , origins : [ ] } } ) ;
7059
7160 test . beforeEach ( async ( { page } ) => {
7261 await loginAsUser ( userWithMultipleCampaigns , page ) ;
7362 } ) ;
7463
75- test ( 'Create message plan' , async ( { page, makeAxeBuilder } ) =>
76- run (
64+ test ( 'Create message plan' , async ( { page, analyze } ) =>
65+ analyze (
7766 new RoutingCreateMessagePlanPage ( page , {
78- messageOrder : 'NHSAPP,EMAIL,SMS,LETTER' ,
79- } ) ,
80- makeAxeBuilder
67+ messageOrder,
68+ } )
8169 ) ) ;
8270
83- test ( 'Create message plan - error' , async ( { page, makeAxeBuilder } ) =>
84- run (
71+ test ( 'Create message plan - error' , async ( { page, analyze } ) =>
72+ analyze (
8573 new RoutingCreateMessagePlanPage ( page , {
86- messageOrder : 'NHSAPP,EMAIL,SMS,LETTER' ,
74+ messageOrder,
8775 } ) ,
88- makeAxeBuilder ,
89- ( p ) => p . clickSubmit ( )
76+ { beforeAnalyze : ( p ) => p . clickSubmit ( ) }
9077 ) ) ;
9178 } ) ;
9279} ) ;
0 commit comments