Skip to content

Commit 9622896

Browse files
authored
msw: Replace null arguments with undefined (#12536)
It works the same, but makes TypeScript happy...
1 parent d5598f3 commit 9622896

File tree

12 files changed

+17
-21
lines changed

12 files changed

+17
-21
lines changed

e2e/acceptance/api-token.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ test.describe('Acceptance | api-tokens', { tag: '@acceptance' }, () => {
7979
await expect(page.locator('[data-test-api-token]')).toHaveCount(3);
8080

8181
await page.click('[data-test-api-token="1"] [data-test-revoke-token-button]');
82-
expect(msw.db.apiToken.findMany(null).length, 'API token has been deleted from the backend database').toBe(2);
82+
expect(msw.db.apiToken.findMany().length, 'API token has been deleted from the backend database').toBe(2);
8383

8484
await expect(page.locator('[data-test-api-token]')).toHaveCount(2);
8585
await expect(page.locator('[data-test-api-token="2"]')).toBeVisible();

packages/crates-io-msw/handlers/api-tokens/create.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ test('creates a new API token', async function () {
1919
let response = await fetch('/api/v1/me/tokens', { method: 'PUT', body });
2020
expect(response.status).toBe(200);
2121

22-
let token = db.apiToken.findMany(null)[0];
22+
let token = db.apiToken.findMany()[0];
2323
expect(token).toBeTruthy();
2424

2525
expect(await response.json()).toMatchInlineSnapshot(`
@@ -53,7 +53,7 @@ test('creates a new API token with scopes', async function () {
5353
let response = await fetch('/api/v1/me/tokens', { method: 'PUT', body });
5454
expect(response.status).toBe(200);
5555

56-
let token = db.apiToken.findMany(null)[0];
56+
let token = db.apiToken.findMany()[0];
5757
expect(token).toBeTruthy();
5858

5959
expect(await response.json()).toMatchInlineSnapshot(`
@@ -91,7 +91,7 @@ test('creates a new API token with expiry date', async function () {
9191
let response = await fetch('/api/v1/me/tokens', { method: 'PUT', body });
9292
expect(response.status).toBe(200);
9393

94-
let token = db.apiToken.findMany(null)[0];
94+
let token = db.apiToken.findMany()[0];
9595
expect(token).toBeTruthy();
9696

9797
expect(await response.json()).toMatchInlineSnapshot(`

packages/crates-io-msw/handlers/api-tokens/delete.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test('revokes an API token', async function () {
1212
expect(response.status).toBe(200);
1313
expect(await response.json()).toMatchInlineSnapshot(`{}`);
1414

15-
let tokens = db.apiToken.findMany(null);
15+
let tokens = db.apiToken.findMany();
1616
expect(tokens.length).toBe(0);
1717
});
1818

packages/crates-io-msw/handlers/categories/list-slugs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { db } from '../../index.js';
44
import { serializeCategorySlug } from '../../serializers/category.js';
55

66
export default http.get('/api/v1/category_slugs', () => {
7-
let allCategories = db.category.findMany(null, { orderBy: { category: 'asc' } });
7+
let allCategories = db.category.findMany(undefined, { orderBy: { category: 'asc' } });
88

99
return HttpResponse.json({ category_slugs: allCategories.map(c => serializeCategorySlug(c)) });
1010
});

packages/crates-io-msw/handlers/categories/list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { pageParams } from '../../utils/handlers.js';
77
export default http.get('/api/v1/categories', ({ request }) => {
88
let { skip, take } = pageParams(request);
99

10-
let categories = db.category.findMany(null, { skip, take, orderBy: { category: 'asc' } });
10+
let categories = db.category.findMany(undefined, { skip, take, orderBy: { category: 'asc' } });
1111
let total = db.category.count();
1212

1313
return HttpResponse.json({ categories: categories.map(c => serializeCategory(c)), meta: { total } });

packages/crates-io-msw/handlers/crates/list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default http.get('/api/v1/crates', async ({ request }) => {
1010

1111
const { start, end } = pageParams(request);
1212

13-
let crates = db.crate.findMany(null);
13+
let crates = db.crate.findMany();
1414

1515
if (url.searchParams.get('following') === '1') {
1616
let { user } = getSession();

packages/crates-io-msw/handlers/keywords/list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { pageParams } from '../../utils/handlers.js';
77
export default http.get('/api/v1/keywords', ({ request }) => {
88
let { skip, take } = pageParams(request);
99

10-
let keywords = db.keyword.findMany(null, { skip, take, orderBy: { crates_cnt: 'desc' } });
10+
let keywords = db.keyword.findMany(undefined, { skip, take, orderBy: { crates_cnt: 'desc' } });
1111
let total = db.keyword.count();
1212

1313
return HttpResponse.json({ keywords: keywords.map(k => serializeKeyword(k)), meta: { total } });

packages/crates-io-msw/handlers/sessions/delete.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ test('returns 200 when authenticated', async function () {
1414
}
1515
`);
1616

17-
expect(db.mswSession.findFirst(null)).toBeFalsy();
17+
expect(db.mswSession.findFirst()).toBeFalsy();
1818
});
1919

2020
test('returns 200 when unauthenticated', async function () {
@@ -26,5 +26,5 @@ test('returns 200 when unauthenticated', async function () {
2626
}
2727
`);
2828

29-
expect(db.mswSession.findFirst(null)).toBeFalsy();
29+
expect(db.mswSession.findFirst()).toBeFalsy();
3030
});

packages/crates-io-msw/handlers/summary.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { compareDates } from '../utils/dates.js';
88

99
export default [
1010
http.get('/api/v1/summary', () => {
11-
let crates = db.crate.findMany(null);
11+
let crates = db.crate.findMany();
1212

1313
let just_updated = crates.sort((a, b) => compareDates(b.updated_at, a.updated_at)).slice(0, 10);
1414
let most_downloaded = crates.sort((a, b) => b.downloads - a.downloads).slice(0, 10);
@@ -18,8 +18,8 @@ export default [
1818
let num_crates = crates.length;
1919
let num_downloads = crates.reduce((sum, crate) => sum + crate.downloads, 0);
2020

21-
let popularCategories = db.category.findMany(null, { take: 10 });
22-
let popularKeywords = db.keyword.findMany(null, { take: 10 });
21+
let popularCategories = db.category.findMany(undefined, { take: 10 });
22+
let popularKeywords = db.keyword.findMany(undefined, { take: 10 });
2323

2424
return HttpResponse.json({
2525
just_updated: just_updated.map(c => serializeCrate(c)),

packages/crates-io-msw/utils/session.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { db } from '../index.js';
22

33
export function getSession() {
4-
let session = db.mswSession.findFirst(null);
4+
let session = db.mswSession.findFirst();
55
if (!session) {
66
return {};
77
}

0 commit comments

Comments
 (0)