Skip to content

Commit f75e48d

Browse files
tests manual fixes
1 parent e83063b commit f75e48d

File tree

5 files changed

+16
-64
lines changed

5 files changed

+16
-64
lines changed

tests/component-tests/apiGateway-tests/testCases/create-mi.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ export type MiRequestBody = {
1313
};
1414

1515
export function miValidRequest(): MiRequestBody {
16-
let requestBody: MiRequestBody;
17-
18-
requestBody = {
16+
return {
1917
data: {
2018
attributes: {
2119
groupId: "group123",
@@ -28,13 +26,10 @@ export function miValidRequest(): MiRequestBody {
2826
type: "ManagementInformation",
2927
},
3028
};
31-
return requestBody;
3229
}
3330

3431
export function miInvalidRequest(): MiRequestBody {
35-
let requestBody: MiRequestBody;
36-
37-
requestBody = {
32+
return {
3833
data: {
3934
attributes: {
4035
groupId: "group123",
@@ -47,13 +42,10 @@ export function miInvalidRequest(): MiRequestBody {
4742
type: "?",
4843
},
4944
};
50-
return requestBody;
5145
}
5246

5347
export function miInvalidDateRequest(): MiRequestBody {
54-
let requestBody: MiRequestBody;
55-
56-
requestBody = {
48+
return {
5749
data: {
5850
attributes: {
5951
groupId: "group123",
@@ -66,5 +58,4 @@ export function miInvalidDateRequest(): MiRequestBody {
6658
type: "ManagementInformation",
6759
},
6860
};
69-
return requestBody;
7061
}

tests/component-tests/apiGateway-tests/testCases/update-letter-status.ts

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,19 @@ export type PatchMessageResponseBody = {
2929
};
3030

3131
export function patchRequestHeaders(): RequestHeaders {
32-
let requestHeaders: RequestHeaders;
33-
requestHeaders = {
32+
return {
3433
headerauth1: process.env.HEADERAUTH || "",
3534
"NHSD-Supplier-ID": SUPPLIERID,
3635
"NHSD-Correlation-ID": "12344",
3736
"X-Request-ID": "requestId1",
3837
};
39-
return requestHeaders;
4038
}
4139

4240
export function patchValidRequestBody(
4341
id: string,
4442
status: string,
4543
): PatchMessageRequestBody {
46-
let requestBody: PatchMessageRequestBody;
47-
48-
requestBody = {
44+
return {
4945
data: {
5046
attributes: {
5147
status,
@@ -54,16 +50,13 @@ export function patchValidRequestBody(
5450
id,
5551
},
5652
};
57-
return requestBody;
5853
}
5954

6055
export function patchFailureRequestBody(
6156
id: string,
6257
status: string,
6358
): PatchMessageRequestBody {
64-
let requestBody: PatchMessageRequestBody;
65-
66-
requestBody = {
59+
return {
6760
data: {
6861
attributes: {
6962
status,
@@ -74,12 +67,10 @@ export function patchFailureRequestBody(
7467
id,
7568
},
7669
};
77-
return requestBody;
7870
}
7971

8072
export function patch400ErrorResponseBody(): ErrorMessageBody {
81-
let responseBody: ErrorMessageBody;
82-
responseBody = {
73+
return {
8374
errors: [
8475
{
8576
id: "12344",
@@ -94,12 +85,10 @@ export function patch400ErrorResponseBody(): ErrorMessageBody {
9485
},
9586
],
9687
};
97-
return responseBody;
9888
}
9989

10090
export function patch500ErrorResponseBody(id: string): ErrorMessageBody {
101-
let responseBody: ErrorMessageBody;
102-
responseBody = {
91+
return {
10392
errors: [
10493
{
10594
id: "12344",
@@ -114,5 +103,4 @@ export function patch500ErrorResponseBody(id: string): ErrorMessageBody {
114103
},
115104
],
116105
};
117-
return responseBody;
118106
}

tests/component-tests/apiGateway-tests/testCases/update-multiple-letter-status.ts

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,25 @@ import {
77
import { SupplierApiLetters } from "../../../helpers/generate-fetch-test-data";
88

99
export function postLettersRequestHeaders(): RequestHeaders {
10-
let requestHeaders: RequestHeaders;
11-
requestHeaders = {
10+
return {
1211
"NHSD-Supplier-ID": SUPPLIERID,
1312
"NHSD-Correlation-ID": "12344",
1413
"X-Request-ID": "requestId1",
1514
};
16-
return requestHeaders;
1715
}
1816

1917
export function postLettersInvalidRequestHeaders(): RequestHeaders {
20-
let requestHeaders: RequestHeaders;
21-
requestHeaders = {
18+
return {
2219
"NHSD-Supplier-ID": SUPPLIERID,
2320
"NHSD-Correlation-ID": "12344",
2421
// Request Id is missing
2522
};
26-
return requestHeaders;
2723
}
2824

2925
export function postValidRequestBody(
3026
letters: SupplierApiLetters[],
3127
): PostMessageRequestBody {
32-
let requestBody: PostMessageRequestBody;
33-
34-
requestBody = {
28+
return {
3529
data: [
3630
{
3731
type: "Letter",
@@ -65,15 +59,12 @@ export function postValidRequestBody(
6559
},
6660
],
6761
};
68-
return requestBody;
6962
}
7063

7164
export function postInvalidStatusRequestBody(
7265
letters: SupplierApiLetters[],
7366
): PostMessageRequestBody {
74-
let requestBody: PostMessageRequestBody;
75-
76-
requestBody = {
67+
return {
7768
data: [
7869
{
7970
type: "Letter",
@@ -91,15 +82,12 @@ export function postInvalidStatusRequestBody(
9182
},
9283
],
9384
};
94-
return requestBody;
9585
}
9686

9787
export function postDuplicateIDRequestBody(
9888
letters: SupplierApiLetters[],
9989
): PostMessageRequestBody {
100-
let requestBody: PostMessageRequestBody;
101-
102-
requestBody = {
90+
return {
10391
data: [
10492
{
10593
type: "Letter",
@@ -117,13 +105,10 @@ export function postDuplicateIDRequestBody(
117105
},
118106
],
119107
};
120-
return requestBody;
121108
}
122109

123110
export function postInvalidStatusResponseBody(): ErrorMessageBody {
124-
let responseBody: ErrorMessageBody;
125-
126-
responseBody = {
111+
return {
127112
errors: [
128113
{
129114
id: "12344",
@@ -138,13 +123,10 @@ export function postInvalidStatusResponseBody(): ErrorMessageBody {
138123
},
139124
],
140125
};
141-
return responseBody;
142126
}
143127

144128
export function postDuplicateIDResponseBody(): ErrorMessageBody {
145-
let responseBody: ErrorMessageBody;
146-
147-
responseBody = {
129+
return {
148130
errors: [
149131
{
150132
id: "12344",
@@ -160,13 +142,10 @@ export function postDuplicateIDResponseBody(): ErrorMessageBody {
160142
},
161143
],
162144
};
163-
return responseBody;
164145
}
165146

166147
export function post500ErrorResponseBody(): ErrorMessageBody {
167-
let responseBody: ErrorMessageBody;
168-
169-
responseBody = {
148+
return {
170149
errors: [
171150
{
172151
id: "12344",
@@ -181,5 +160,4 @@ export function post500ErrorResponseBody(): ErrorMessageBody {
181160
},
182161
],
183162
};
184-
return responseBody;
185163
}

tests/config/reporters.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import type { ReporterDescription } from "@playwright/test";
22
import path from "node:path";
33

44
const resultsDir = process.env.RESULTS_DIR || "results";
5-
const reportsDir = process.env.REPORTS_DIR || "reports";
65

76
export function getReporters(allureFolder: string) {
87
return [

tests/helpers/pnpm-helpers.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@ export async function runCreateLetter(options: {
6060
];
6161

6262
await new Promise<void>((resolve, reject) => {
63-
let output = "";
6463
const child = spawn(cmd, args, {
6564
stdio: "inherit",
6665
cwd: root,
6766
shell: false,
6867
});
6968
child.stdout?.on("id", (id) => {
7069
const text = id.toString();
71-
output += text;
7270
process.stdout.write(text);
7371
});
7472

@@ -118,15 +116,13 @@ export async function createSupplierData(options: {
118116
];
119117

120118
await new Promise<void>((resolve, reject) => {
121-
let output = "";
122119
const child = spawn(cmd, args, {
123120
stdio: "inherit",
124121
cwd: root,
125122
shell: false,
126123
});
127124
child.stdout?.on("id", (id) => {
128125
const text = id.toString();
129-
output += text;
130126
process.stdout.write(text);
131127
});
132128

0 commit comments

Comments
 (0)