Skip to content

Commit 54ca799

Browse files
author
nebarf
committed
Fix tests
1 parent 2347e03 commit 54ca799

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

src/__tests__/fixtures/http-client-config-provider.fixture.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import React, { ReactElement } from 'react';
22
import { HttpClientConfigProvider, HttpClientProviderConfig } from '../..';
33

44
export class HttpClientProviderConfigFixture {
5-
static defaultOptions: Partial<HttpClientProviderConfig> = {};
5+
static defaultOptions: Partial<HttpClientProviderConfig<undefined>> = {};
66

7-
static create(
8-
options?: Partial<HttpClientProviderConfig>
7+
static create<HttpRequestBodyT = void>(
8+
options?: Partial<HttpClientProviderConfig<HttpRequestBodyT>>
99
): ({ children }: { children: ReactElement }) => ReactElement {
10-
const fallenbackOptions: Partial<HttpClientProviderConfig> =
10+
const fallenbackOptions: Partial<HttpClientProviderConfig<HttpRequestBodyT>> =
1111
options || HttpClientProviderConfigFixture.defaultOptions;
1212

1313
return ({ children }: { children: ReactElement }): ReactElement => {

src/__tests__/fixtures/http-request.fixture.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
import { HttpMethod, HttpRequest, HttpRequestProps } from '../..';
22

33
export class HttpRequestFixture {
4-
static defaultOptions: HttpRequestProps = {
4+
static defaultOptions: HttpRequestProps<undefined> = {
55
baseUrl: 'http://rhf.com',
66
method: HttpMethod.Get,
77
relativeUrl: 'comments',
88
};
99

10-
static create(options?: HttpRequestProps): HttpRequest {
11-
const fallenbackOptions: HttpRequestProps = options || HttpRequestFixture.defaultOptions;
10+
static create<HttpRequestBodyT = void>(
11+
options?: HttpRequestProps<HttpRequestBodyT>
12+
): HttpRequest<HttpRequestBodyT> {
13+
const fallenbackOptions: HttpRequestProps<HttpRequestBodyT> = {
14+
...HttpRequestFixture.defaultOptions,
15+
...options,
16+
};
1217

1318
return new HttpRequest(fallenbackOptions);
1419
}

src/__tests__/http-cache.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('http-fetch', () => {
2929
const cachedResponse = { name: 'Phelony' };
3030

3131
httpCache.put(httpRequest, cachedResponse);
32-
const expiredCachedResponse = httpCache.get<{ name: string }>(httpRequest);
32+
const expiredCachedResponse = httpCache.get<{ name: string }, void>(httpRequest);
3333

3434
expect(expiredCachedResponse).toEqual(cachedResponse);
3535
expect(setTimeout).toHaveBeenCalledTimes(1);
@@ -46,14 +46,14 @@ describe('http-fetch', () => {
4646
const httpResponse = { name: 'Phelony' };
4747

4848
httpCache.put(httpRequest, httpResponse);
49-
const cachedResponse = httpCache.get<{ name: string }>(httpRequest);
49+
const cachedResponse = httpCache.get<{ name: string }, void>(httpRequest);
5050

5151
expect(cachedResponse).toEqual(httpResponse);
5252
expect(setTimeout).toHaveBeenCalledTimes(1);
5353
expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 6000);
5454

5555
jest.runOnlyPendingTimers();
56-
const expiredCachedResponse = httpCache.get<{ name: string }>(httpRequest);
56+
const expiredCachedResponse = httpCache.get<{ name: string }, void>(httpRequest);
5757
expect(expiredCachedResponse).toBeUndefined();
5858
});
5959

src/__tests__/use-http-client.spec.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ describe('use-http-client', () => {
144144

145145
await useHttpClientResult.current.request({});
146146

147-
function checkHttpEventHandlerReqParam(httpRequest: HttpRequest) {
147+
function checkHttpEventHandlerReqParam(httpRequest: HttpRequest<void>) {
148148
expect(httpRequest.baseUrl).toBe('');
149-
expect(httpRequest.body).toBeNull();
149+
expect(httpRequest.body).toBeUndefined();
150150
expect(httpRequest.credentials).toBeUndefined();
151151
expect(httpRequest.headers).toEqual(defaultHttpReqConfig.reqOptions.headers);
152152
expect(httpRequest.maxAge).toBe(0);
@@ -197,9 +197,9 @@ describe('use-http-client', () => {
197197
});
198198
} catch (error) {}
199199

200-
function checkHttpEventHandlerReqParam(httpRequest: HttpRequest) {
200+
function checkHttpEventHandlerReqParam(httpRequest: HttpRequest<void>) {
201201
expect(httpRequest.baseUrl).toBe('');
202-
expect(httpRequest.body).toBeNull();
202+
expect(httpRequest.body).toBeUndefined();
203203
expect(httpRequest.credentials).toBeUndefined();
204204
expect(httpRequest.headers).toEqual(defaultHttpReqConfig.reqOptions.headers);
205205
expect(httpRequest.maxAge).toBe(0);
@@ -287,7 +287,7 @@ describe('use-http-client', () => {
287287
const { post } = result.current;
288288

289289
const res1 = await post({
290-
requestOptions: { body: JSON.stringify({ name: 'Rico' }) },
290+
requestOptions: { body: { name: 'Rico' } },
291291
});
292292

293293
expect(res1).toEqual(fetchResponse);

0 commit comments

Comments
 (0)