Skip to content

Commit 1ca10b5

Browse files
committed
revert statusCode change
1 parent a0b2c9e commit 1ca10b5

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

packages/signals/signals-integration-tests/src/tests/signals-vanilla/network-signals-fetch.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ test.describe('network signals - fetch', () => {
6969
action: 'response',
7070
url: 'http://localhost/test',
7171
data: { foo: 'test' },
72-
statusCode: 200,
72+
status: 200,
7373
ok: true,
7474
})
7575
})
@@ -179,7 +179,7 @@ test.describe('network signals - fetch', () => {
179179
action: 'response',
180180
url: 'http://localhost/test',
181181
data: { errorMsg: 'foo' },
182-
statusCode: 400,
182+
status: 400,
183183
ok: false,
184184
})
185185
expect(responses).toHaveLength(1)
@@ -218,7 +218,7 @@ test.describe('network signals - fetch', () => {
218218
action: 'response',
219219
url: 'http://localhost/test',
220220
data: 'foo',
221-
statusCode: 400,
221+
status: 400,
222222
ok: false,
223223
})
224224
expect(responses).toHaveLength(1)

packages/signals/signals/src/core/signal-generators/network-gen/__tests__/network-generator.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ describe(NetworkGenerator, () => {
150150
"data": "test",
151151
},
152152
"ok": true,
153-
"statusCode": 200,
153+
"status": 200,
154154
"url": "http://localhost/api",
155155
},
156156
"metadata": {
@@ -213,7 +213,7 @@ describe(NetworkGenerator, () => {
213213
"data": "test",
214214
},
215215
"ok": true,
216-
"statusCode": 200,
216+
"status": 200,
217217
"url": "http://localhost/test",
218218
},
219219
"metadata": {

packages/signals/signals/src/core/signal-generators/network-gen/helpers.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ export function isPlainObject(obj: unknown): obj is Record<string, unknown> {
6666
)
6767
}
6868

69-
export const isOk = (statusCode: number) =>
70-
statusCode >= 200 && statusCode < 300
69+
export const isOk = (status: number) => status >= 200 && status < 300
7170

7271
/**
7372
* Safely parse JSON, if it fails, return the original text.

packages/signals/signals/src/core/signal-generators/network-gen/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class NetworkGenerator implements SignalGenerator {
100100
url,
101101
data: data,
102102
ok: rs.ok,
103-
statusCode: rs.statusCode,
103+
status: rs.status,
104104
},
105105
createMetadata()
106106
)

packages/signals/signals/src/core/signal-generators/network-gen/network-interceptor.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface NetworkInterceptorRequest {
2121

2222
export interface NetworkInterceptorResponse {
2323
url: string
24-
statusCode: number
24+
status: number
2525
ok: boolean
2626
statusText: string
2727
headers: Headers
@@ -58,7 +58,7 @@ const createInterceptorResponse = ({
5858
body,
5959
headers,
6060
initiator,
61-
statusCode,
61+
status,
6262
statusText,
6363
url,
6464
responseType,
@@ -67,7 +67,7 @@ const createInterceptorResponse = ({
6767
body: () => Promise<JSONValue>
6868
headers: Headers
6969
initiator: 'fetch' | 'xhr'
70-
statusCode: number
70+
status: number
7171
statusText: string
7272
url: string
7373
responseType: XMLHttpRequestResponseType | undefined
@@ -76,8 +76,8 @@ const createInterceptorResponse = ({
7676
body,
7777
headers,
7878
initiator,
79-
ok: isOk(statusCode),
80-
statusCode,
79+
ok: isOk(status),
80+
status,
8181
statusText,
8282
url,
8383
responseType,
@@ -161,7 +161,7 @@ export class NetworkInterceptor {
161161
body: lazyBody,
162162
headers: response.headers,
163163
initiator: 'fetch',
164-
statusCode: response.status,
164+
status: response.status,
165165
statusText: response.statusText,
166166
url: response.url,
167167
responseType: undefined,
@@ -240,7 +240,7 @@ export class NetworkInterceptor {
240240
try {
241241
onResponse(
242242
createInterceptorResponse({
243-
statusCode: this.status,
243+
status: this.status,
244244
responseType: this.responseType,
245245
statusText: this.statusText,
246246
url: this.responseURL,

packages/signals/signals/src/types/__tests__/create-network-signal.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe(createNetworkSignal, () => {
6060
action: 'response',
6161
url: 'http://example.com',
6262
ok: true,
63-
statusCode: 200,
63+
status: 200,
6464
data: { key: 'value' },
6565
}
6666

@@ -74,7 +74,7 @@ describe(createNetworkSignal, () => {
7474
"key": "value",
7575
},
7676
"ok": true,
77-
"statusCode": 200,
77+
"status": 200,
7878
"url": "http://example.com",
7979
},
8080
"metadata": {

0 commit comments

Comments
 (0)