Skip to content

Commit bfffead

Browse files
Copilotecraig12345
Copilot
and
ecraig12345
authored
Simplify typed jest.fn() mock patterns to use plain implementations
Agent-Logs-Url: https://github.com/microsoft/lage/sessions/8011205b-bec8-4484-a97a-eb6763c3c6d2 Co-authored-by: ecraig12345 <5864305+ecraig12345@users.noreply.github.com>
1 parent 5fd91c3 commit bfffead

3 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎packages/backfill/src/__tests__/api.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ describe("api", () => {
1111
const logger = makeLogger("silly", process.stdout, process.stderr);
1212
const config = createDefaultConfig(packageRoot);
1313
const provider = {
14-
fetch: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
15-
put: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
14+
fetch: jest.fn(() => Promise.resolve(true)),
15+
put: jest.fn(() => Promise.resolve(true)),
1616
};
1717

1818
config.cacheStorageConfig = {
@@ -37,8 +37,8 @@ describe("api", () => {
3737
const logger = makeLogger("silly", process.stdout, process.stderr);
3838
const config = createDefaultConfig(packageRoot);
3939
const provider = {
40-
fetch: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
41-
put: jest.fn<() => Promise<boolean>>().mockResolvedValue(true),
40+
fetch: jest.fn(() => Promise.resolve(true)),
41+
put: jest.fn(() => Promise.resolve(true)),
4242
};
4343

4444
config.cacheStorageConfig = {

‎packages/cache/src/__tests__/RemoteFallbackCacheProvider.test.ts‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ describe("RemoteFallbackCacheProvider", () => {
1010
const root = "/test";
1111

1212
const localCacheProvider: CacheProvider = {
13-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(true)),
14-
put: jest.fn<CacheProvider["put"]>(),
15-
clear: jest.fn<CacheProvider["clear"]>(),
16-
purge: jest.fn<CacheProvider["purge"]>(),
13+
fetch: jest.fn(() => Promise.resolve(true)),
14+
put: jest.fn(),
15+
clear: jest.fn(),
16+
purge: jest.fn(),
1717
};
1818

1919
const remoteCacheProvider: CacheProvider = {
20-
fetch: jest.fn<CacheProvider["fetch"]>(),
21-
put: jest.fn<CacheProvider["put"]>(),
22-
clear: jest.fn<CacheProvider["clear"]>(),
23-
purge: jest.fn<CacheProvider["purge"]>(),
20+
fetch: jest.fn(),
21+
put: jest.fn(),
22+
clear: jest.fn(),
23+
purge: jest.fn(),
2424
};
2525

2626
const options: RemoteFallbackCacheProviderOptions = {
@@ -54,17 +54,17 @@ describe("RemoteFallbackCacheProvider", () => {
5454
const root = "/test";
5555

5656
const localCacheProvider: CacheProvider = {
57-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(false)),
58-
put: jest.fn<CacheProvider["put"]>(),
59-
clear: jest.fn<CacheProvider["clear"]>(),
60-
purge: jest.fn<CacheProvider["purge"]>(),
57+
fetch: jest.fn(() => Promise.resolve(false)),
58+
put: jest.fn(),
59+
clear: jest.fn(),
60+
purge: jest.fn(),
6161
};
6262

6363
const remoteCacheProvider: CacheProvider = {
64-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(true)),
65-
put: jest.fn<CacheProvider["put"]>(),
66-
clear: jest.fn<CacheProvider["clear"]>(),
67-
purge: jest.fn<CacheProvider["purge"]>(),
64+
fetch: jest.fn(() => Promise.resolve(true)),
65+
put: jest.fn(),
66+
clear: jest.fn(),
67+
purge: jest.fn(),
6868
};
6969

7070
const options: RemoteFallbackCacheProviderOptions = {
@@ -98,10 +98,10 @@ describe("RemoteFallbackCacheProvider", () => {
9898
const root = "/test";
9999

100100
const remoteCacheProvider: CacheProvider = {
101-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(true)),
102-
put: jest.fn<CacheProvider["put"]>(),
103-
clear: jest.fn<CacheProvider["clear"]>(),
104-
purge: jest.fn<CacheProvider["purge"]>(),
101+
fetch: jest.fn(() => Promise.resolve(true)),
102+
put: jest.fn(),
103+
clear: jest.fn(),
104+
purge: jest.fn(),
105105
};
106106

107107
const options: RemoteFallbackCacheProviderOptions = {
@@ -134,17 +134,17 @@ describe("RemoteFallbackCacheProvider", () => {
134134
const root = "/test";
135135

136136
const localCacheProvider: CacheProvider = {
137-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(false)),
138-
put: jest.fn<CacheProvider["put"]>(),
139-
clear: jest.fn<CacheProvider["clear"]>(),
140-
purge: jest.fn<CacheProvider["purge"]>(),
137+
fetch: jest.fn(() => Promise.resolve(false)),
138+
put: jest.fn(),
139+
clear: jest.fn(),
140+
purge: jest.fn(),
141141
};
142142

143143
const remoteCacheProvider: CacheProvider = {
144-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(true)),
145-
put: jest.fn<CacheProvider["put"]>(),
146-
clear: jest.fn<CacheProvider["clear"]>(),
147-
purge: jest.fn<CacheProvider["purge"]>(),
144+
fetch: jest.fn(() => Promise.resolve(true)),
145+
put: jest.fn(),
146+
clear: jest.fn(),
147+
purge: jest.fn(),
148148
isReadOnly: true,
149149
};
150150

@@ -180,18 +180,18 @@ describe("RemoteFallbackCacheProvider", () => {
180180
const root = "/test";
181181

182182
const localCacheProvider: CacheProvider = {
183-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(false)),
184-
put: jest.fn<CacheProvider["put"]>(),
185-
clear: jest.fn<CacheProvider["clear"]>(),
186-
purge: jest.fn<CacheProvider["purge"]>(),
183+
fetch: jest.fn(() => Promise.resolve(false)),
184+
put: jest.fn(),
185+
clear: jest.fn(),
186+
purge: jest.fn(),
187187
isReadOnly: true,
188188
};
189189

190190
const remoteCacheProvider: CacheProvider = {
191-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(true)),
192-
put: jest.fn<CacheProvider["put"]>(),
193-
clear: jest.fn<CacheProvider["clear"]>(),
194-
purge: jest.fn<CacheProvider["purge"]>(),
191+
fetch: jest.fn(() => Promise.resolve(true)),
192+
put: jest.fn(),
193+
clear: jest.fn(),
194+
purge: jest.fn(),
195195
isReadOnly: true,
196196
};
197197

@@ -229,17 +229,17 @@ describe("RemoteFallbackCacheProvider", () => {
229229
const root = "/test";
230230

231231
const localCacheProvider: CacheProvider = {
232-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(false)),
233-
put: jest.fn<CacheProvider["put"]>(),
234-
clear: jest.fn<CacheProvider["clear"]>(),
235-
purge: jest.fn<CacheProvider["purge"]>(),
232+
fetch: jest.fn(() => Promise.resolve(false)),
233+
put: jest.fn(),
234+
clear: jest.fn(),
235+
purge: jest.fn(),
236236
};
237237

238238
const remoteCacheProvider: CacheProvider = {
239-
fetch: jest.fn<CacheProvider["fetch"]>().mockReturnValue(Promise.resolve(false)),
240-
put: jest.fn<CacheProvider["put"]>(),
241-
clear: jest.fn<CacheProvider["clear"]>(),
242-
purge: jest.fn<CacheProvider["purge"]>(),
239+
fetch: jest.fn(() => Promise.resolve(false)),
240+
put: jest.fn(),
241+
clear: jest.fn(),
242+
purge: jest.fn(),
243243
};
244244

245245
const options: RemoteFallbackCacheProviderOptions = {

‎packages/cache/src/__tests__/chunkPromise.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { chunkPromise } from "../chunkPromise.js";
44
describe("chunking promises", () => {
55
it("should chunk promises", async () => {
66
const mockedPromiseFns = [
7-
jest.fn<() => Promise<number>>().mockResolvedValue(1).mockName("1"),
8-
jest.fn<() => Promise<number>>().mockResolvedValue(2).mockName("2"),
9-
jest.fn<() => Promise<number>>().mockResolvedValue(3).mockName("3"),
10-
jest.fn<() => Promise<number>>().mockResolvedValue(4).mockName("4"),
11-
jest.fn<() => Promise<number>>().mockResolvedValue(5).mockName("5"),
7+
jest.fn(() => Promise.resolve(1)).mockName("1"),
8+
jest.fn(() => Promise.resolve(2)).mockName("2"),
9+
jest.fn(() => Promise.resolve(3)).mockName("3"),
10+
jest.fn(() => Promise.resolve(4)).mockName("4"),
11+
jest.fn(() => Promise.resolve(5)).mockName("5"),
1212
];
1313

1414
await chunkPromise(mockedPromiseFns, 2);
@@ -20,11 +20,11 @@ describe("chunking promises", () => {
2020

2121
it("should throw, if one promise was rejected", () => {
2222
const mockedPromiseFns = [
23-
jest.fn<() => Promise<number>>().mockResolvedValue(1).mockName("1"),
24-
jest.fn<() => Promise<number>>().mockResolvedValue(2).mockName("2"),
25-
jest.fn<() => Promise<number>>().mockResolvedValue(3).mockName("3"),
26-
jest.fn<() => Promise<number>>().mockResolvedValue(4).mockName("4"),
27-
jest.fn<() => Promise<number>>().mockResolvedValue(5).mockName("5"),
23+
jest.fn(() => Promise.resolve(1)).mockName("1"),
24+
jest.fn(() => Promise.resolve(2)).mockName("2"),
25+
jest.fn(() => Promise.resolve(3)).mockName("3"),
26+
jest.fn(() => Promise.resolve(4)).mockName("4"),
27+
jest.fn(() => Promise.resolve(5)).mockName("5"),
2828
];
2929

3030
expect(async () => await chunkPromise(mockedPromiseFns, 2)).rejects;

0 commit comments

Comments
 (0)