Skip to content

Commit 5a5462a

Browse files
committed
CCM-10893 Lint fix
1 parent 71cd3e1 commit 5a5462a

File tree

3 files changed

+35
-17
lines changed

3 files changed

+35
-17
lines changed

tests/accessibility/test-user-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class TestUserClient {
2121
constructor(
2222
private readonly userPoolId: string,
2323
private readonly clientSsmPathPrefix: string
24-
) { }
24+
) {}
2525

2626
async createTestUser(
2727
email: string,

tests/test-team/helpers/auth/cognito-auth-helper.ts

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ import {
1515
type ClientKey,
1616
} from '../client/client-helper';
1717

18-
export type UserIdentityAttributes = 'given_name' | 'family_name' | 'preferred_username';
18+
export type UserIdentityAttributes =
19+
| 'given_name'
20+
| 'family_name'
21+
| 'preferred_username';
1922

2023
type TestUserStaticDetails = {
2124
userId: string;
@@ -169,12 +172,16 @@ export class CognitoAuthHelper {
169172
}
170173

171174
if (userCtx.refreshToken) {
172-
return (await this.refreshUserSessionTokens(id, userCtx.refreshToken))
173-
.accessToken;
175+
const refeshedTokens = await this.refreshUserSessionTokens(
176+
id,
177+
userCtx.refreshToken
178+
);
179+
return refeshedTokens.accessToken;
174180
}
175181
}
176182

177-
return (await this.passwordAuth(id)).accessToken;
183+
const authTokens = await this.passwordAuth(id);
184+
return authTokens.accessToken;
178185
}
179186

180187
public async getIdToken(id: string): Promise<string> {
@@ -185,11 +192,15 @@ export class CognitoAuthHelper {
185192
}
186193

187194
if (userCtx?.refreshToken) {
188-
return (await this.refreshUserSessionTokens(id, userCtx.refreshToken))
189-
.idToken;
195+
const refeshedTokens = await this.refreshUserSessionTokens(
196+
id,
197+
userCtx.refreshToken
198+
);
199+
return refeshedTokens.idToken;
190200
}
191201

192-
return (await this.passwordAuth(id)).idToken;
202+
const authTokens = await this.passwordAuth(id);
203+
return authTokens.idToken;
193204
}
194205

195206
public async getTestUser(id: string): Promise<TestUser> {
@@ -220,25 +231,28 @@ export class CognitoAuthHelper {
220231
const email = faker.internet.exampleEmail();
221232
const tempPassword = CognitoAuthHelper.generatePassword();
222233

223-
const clientName = (clientKey: string): string =>
224-
`NHS Test ${clientKey.replaceAll(/([a-z])([A-Z])/g, '$1 $2')}`;
225-
226234
const clientId = `${userDetails.clientKey}--${this.runId}`;
235+
const clientName = `NHS Test ${userDetails.clientKey.replaceAll(/([a-z])([A-Z])/g, '$1 $2')}`;
227236

228237
const clientAttributes = [
229238
{ Name: 'custom:sbx_client_id', Value: clientId },
230239
{
231240
Name: 'custom:sbx_client_name',
232-
Value: clientName(userDetails.clientKey),
241+
Value: clientName,
233242
},
234243
];
235244

236245
const {
237246
userId,
238-
userAttributes = ['preferred_username', 'given_name', 'family_name'] as UserIdentityAttributes[],
247+
userAttributes = [
248+
'preferred_username',
249+
'given_name',
250+
'family_name',
251+
] as UserIdentityAttributes[],
239252
} = userDetails;
240253

241-
const identityAttributes: Partial<Record<UserIdentityAttributes, string>> = {};
254+
const identityAttributes: Partial<Record<UserIdentityAttributes, string>> =
255+
{};
242256

243257
if (userAttributes.includes('given_name'))
244258
identityAttributes.given_name = 'Test';
@@ -284,7 +298,7 @@ export class CognitoAuthHelper {
284298
'',
285299
clientId: clientId,
286300
clientKey: userDetails.clientKey,
287-
clientName: clientName(userDetails.clientKey),
301+
clientName: clientName,
288302
identityAttributes,
289303
password: tempPassword,
290304
}

tests/test-team/template-mgmt-component-tests/template-mgmt-header.component.spec.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ test.describe('Header component', () => {
4949
}) => {
5050
const startPage = new TemplateMgmtStartPage(page);
5151

52+
await assertHeaderLogoLink({ page: startPage });
5253
await assertHeaderWhenSignedOut({ page: startPage });
5354
await assertSignInLink({ page: startPage });
5455
await assertClickHeaderLogoRedirectsToStartPage({
@@ -64,13 +65,13 @@ test.describe('Header component', () => {
6465

6566
await loginAsUser(userWithAllIdentityAttributes, page);
6667

68+
await assertHeaderLogoLink({ page: startPage });
6769
await assertHeaderWhenSignedIn({
6870
page: startPage,
6971
expectedDisplayName:
7072
userWithRoutingEnabled.identityAttributes?.preferred_username ?? '',
7173
expectedClientName: userWithRoutingEnabled.clientName ?? '',
7274
});
73-
7475
await assertSignOutLink({ page: startPage });
7576
});
7677

@@ -87,14 +88,14 @@ test.describe('Header component', () => {
8788
userWithRoutingEnabled.identityAttributes?.preferred_username ?? '',
8889
expectedClientName: userWithRoutingEnabled.clientName ?? '',
8990
});
90-
9191
await assertSignOutLink({ page: startPage });
9292
});
9393

9494
test('when user has only given and family name, header shows full name and client name', async ({
9595
page,
9696
}) => {
9797
const startPage = new TemplateMgmtStartPage(page);
98+
9899
await loginAsUser(userWithGivenAndFamilyNameOnly, page);
99100

100101
const expectedName = `Dr ${userWithGivenAndFamilyNameOnly.identityAttributes?.given_name} ${userWithGivenAndFamilyNameOnly.identityAttributes?.family_name}`;
@@ -110,6 +111,7 @@ test.describe('Header component', () => {
110111
page,
111112
}) => {
112113
const startPage = new TemplateMgmtStartPage(page);
114+
113115
await loginAsUser(userWithNoIdentityAttributes, page);
114116

115117
await assertHeaderWhenSignedIn({
@@ -136,6 +138,7 @@ test.describe('Header component', () => {
136138
page,
137139
}) => {
138140
const startPage = new TemplateMgmtStartPage(page);
141+
139142
await loginAsUser(userWithRoutingDisabled, page);
140143

141144
await assertHeaderNavigationLinks({
@@ -148,6 +151,7 @@ test.describe('Header component', () => {
148151
page,
149152
}) => {
150153
const startPage = new TemplateMgmtStartPage(page);
154+
151155
await loginAsUser(userWithNoClient, page);
152156

153157
await assertHeaderWhenSignedIn({

0 commit comments

Comments
 (0)