Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/acceptance/crate.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ test.describe('Acceptance | crate page', { tag: '@acceptance' }, () => {
});

test('other crate loading error shows an error message', async ({ page, msw }) => {
msw.worker.use(http.get('/api/v1/crates/:crate_name', () => HttpResponse.json({}, { status: 500 })));
await msw.worker.use(http.get('/api/v1/crates/:crate_name', () => HttpResponse.json({}, { status: 500 })));

await page.goto('/crates/nanomsg');
await expect(page).toHaveURL('/crates/nanomsg');
Expand Down
2 changes: 1 addition & 1 deletion e2e/acceptance/front-page.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test.describe('Acceptance | front page', { tag: '@acceptance' }, () => {
await msw.worker.resetHandlers();

let deferred = defer();
msw.worker.use(http.get('/api/v1/summary', () => deferred.promise));
await msw.worker.use(http.get('/api/v1/summary', () => deferred.promise));

const button = page.locator('[data-test-try-again-button]');
await button.click();
Expand Down
4 changes: 2 additions & 2 deletions e2e/acceptance/login.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test.describe('Acceptance | Login', { tag: '@acceptance' }, () => {
};
});

msw.worker.use(
await msw.worker.use(
http.get('/api/private/session/begin', () => HttpResponse.json({ url: 'url-to-github-including-state-secret' })),
http.get('/api/private/session/authorize', async ({ request }) => {
let url = new URL(request.url);
Expand Down Expand Up @@ -69,7 +69,7 @@ test.describe('Acceptance | Login', { tag: '@acceptance' }, () => {
};
});

msw.worker.use(
await msw.worker.use(
http.get('/api/private/session/begin', () => HttpResponse.json({ url: 'url-to-github-including-state-secret' })),
http.get('/api/private/session/authorize', () =>
HttpResponse.json({ errors: [{ detail: 'Forbidden' }] }, { status: 403 }),
Expand Down
4 changes: 2 additions & 2 deletions e2e/acceptance/publish-notifications.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test.describe('Acceptance | publish notifications', { tag: '@acceptance' }, () =
await msw.authenticateAs(user);

let deferred = defer();
msw.worker.use(http.put('/api/v1/users/:user_id', () => deferred.promise));
await msw.worker.use(http.put('/api/v1/users/:user_id', () => deferred.promise));

await page.goto('/settings/profile');
await expect(page).toHaveURL('/settings/profile');
Expand All @@ -51,7 +51,7 @@ test.describe('Acceptance | publish notifications', { tag: '@acceptance' }, () =
let user = await msw.db.user.create({});
await msw.authenticateAs(user);

msw.worker.use(http.put('/api/v1/users/:user_id', () => HttpResponse.text('', { status: 500 })));
await msw.worker.use(http.put('/api/v1/users/:user_id', () => HttpResponse.text('', { status: 500 })));

await page.goto('/settings/profile');
await expect(page).toHaveURL('/settings/profile');
Expand Down
4 changes: 3 additions & 1 deletion e2e/acceptance/readme-rendering.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ test.describe('Acceptance | README rendering', { tag: '@acceptance' }, () => {
await msw.db.version.create({ crate, num: '1.0.0', readme: 'foo' });

// Simulate a server error when fetching the README
msw.worker.use(http.get('/api/v1/crates/:name/:version/readme', () => HttpResponse.html('', { status: 500 })));
await msw.worker.use(
http.get('/api/v1/crates/:name/:version/readme', () => HttpResponse.html('', { status: 500 })),
);

await page.goto('/crates/serde');
await expect(page.locator('[data-test-readme-error]')).toBeVisible();
Expand Down
6 changes: 3 additions & 3 deletions e2e/acceptance/search.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ test.describe('Acceptance | search', { tag: '@acceptance' }, () => {
});

test('passes query parameters to the backend', async ({ page, msw }) => {
msw.worker.use(
await msw.worker.use(
http.get('/api/v1/crates', function ({ request }) {
let url = new URL(request.url);
expect(Object.fromEntries(url.searchParams.entries())).toEqual({
Expand All @@ -182,7 +182,7 @@ test.describe('Acceptance | search', { tag: '@acceptance' }, () => {
});

test('supports `keyword:bla` filters', async ({ page, msw }) => {
msw.worker.use(
await msw.worker.use(
http.get('/api/v1/crates', function ({ request }) {
let url = new URL(request.url);
expect(Object.fromEntries(url.searchParams.entries())).toEqual({
Expand All @@ -201,7 +201,7 @@ test.describe('Acceptance | search', { tag: '@acceptance' }, () => {
});

test('`all_keywords` query parameter takes precedence over `keyword` filters', async ({ page, msw }) => {
msw.worker.use(
await msw.worker.use(
http.get('/api/v1/crates', function ({ request }) {
let url = new URL(request.url);
expect(Object.fromEntries(url.searchParams.entries())).toEqual({
Expand Down
2 changes: 1 addition & 1 deletion e2e/routes/category.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test.describe('Route | category', { tag: '@routes' }, () => {
});

test('server error causes the error page to be shown', async ({ page, msw }) => {
msw.worker.use(http.get('/api/v1/categories/:categoryId', () => HttpResponse.json({}, { status: 500 })));
await msw.worker.use(http.get('/api/v1/categories/:categoryId', () => HttpResponse.json({}, { status: 500 })));

await page.goto('/categories/foo');
await expect(page).toHaveURL('/categories/foo');
Expand Down
4 changes: 2 additions & 2 deletions e2e/routes/crate/delete.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ test.describe('Route: crate.delete', { tag: '@routes' }, () => {
await prepare(msw);

let deferred = defer();
msw.worker.use(http.delete('/api/v1/crates/:name', () => deferred.promise));
await msw.worker.use(http.delete('/api/v1/crates/:name', () => deferred.promise));

await page.goto('/crates/foo/delete');
await page.fill('[data-test-reason]', "I don't need this crate anymore");
Expand All @@ -83,7 +83,7 @@ test.describe('Route: crate.delete', { tag: '@routes' }, () => {
await prepare(msw);

let payload = { errors: [{ detail: 'only crates without reverse dependencies can be deleted after 72 hours' }] };
msw.worker.use(http.delete('/api/v1/crates/:name', () => HttpResponse.json(payload, { status: 422 })));
await msw.worker.use(http.delete('/api/v1/crates/:name', () => HttpResponse.json(payload, { status: 422 })));

await page.goto('/crates/foo/delete');
await page.fill('[data-test-reason]', "I don't need this crate anymore");
Expand Down
4 changes: 2 additions & 2 deletions e2e/routes/crate/range.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ test.describe('Route | crate.range', { tag: '@routes' }, () => {
});

test('shows an error page if crate fails to load', async ({ page, msw }) => {
msw.worker.use(http.get('/api/v1/crates/:crate_name', () => HttpResponse.json({}, { status: 500 })));
await msw.worker.use(http.get('/api/v1/crates/:crate_name', () => HttpResponse.json({}, { status: 500 })));

await page.goto('/crates/foo/range/^3');
await expect(page).toHaveURL('/crates/foo/range/%5E3');
Expand Down Expand Up @@ -111,7 +111,7 @@ test.describe('Route | crate.range', { tag: '@routes' }, () => {
let crate = await msw.db.crate.create({ name: 'foo' });
await msw.db.version.create({ crate, num: '3.2.1' });

msw.worker.use(http.get('/api/v1/crates/:crate_name/versions', () => HttpResponse.json({}, { status: 500 })));
await msw.worker.use(http.get('/api/v1/crates/:crate_name/versions', () => HttpResponse.json({}, { status: 500 })));

await page.goto('/crates/foo/range/^3');
await expect(page).toHaveURL('/crates/foo/range/%5E3');
Expand Down
2 changes: 1 addition & 1 deletion e2e/routes/crate/settings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ test.describe('Route | crate.settings', { tag: '@routes' }, () => {
});

let deferred = defer();
msw.worker.use(http.patch('/api/v1/crates/:name', () => deferred.promise));
await msw.worker.use(http.patch('/api/v1/crates/:name', () => deferred.promise));

await page.goto('/crates/foo/settings');

Expand Down
4 changes: 2 additions & 2 deletions e2e/routes/crate/settings/new-trusted-publisher.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ test.describe('Route | crate.settings.new-trusted-publisher', { tag: '@routes' }

// Mock the server to return an error
let deferred = defer();
msw.worker.use(http.post('/api/v1/trusted_publishing/github_configs', () => deferred.promise));
await msw.worker.use(http.post('/api/v1/trusted_publishing/github_configs', () => deferred.promise));

await page.goto(`/crates/${crate.name}/settings/new-trusted-publisher`);
await expect(page).toHaveURL(`/crates/${crate.name}/settings/new-trusted-publisher`);
Expand Down Expand Up @@ -463,7 +463,7 @@ test.describe('Route | crate.settings.new-trusted-publisher', { tag: '@routes' }

// Mock the server to return an error
let deferred = defer();
msw.worker.use(http.post('/api/v1/trusted_publishing/gitlab_configs', () => deferred.promise));
await msw.worker.use(http.post('/api/v1/trusted_publishing/gitlab_configs', () => deferred.promise));

await page.goto(`/crates/${crate.name}/settings/new-trusted-publisher`);
await expect(page).toHaveURL(`/crates/${crate.name}/settings/new-trusted-publisher`);
Expand Down
12 changes: 6 additions & 6 deletions e2e/routes/crate/version/docs-link.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test.describe('Route | crate.version | docs link', { tag: '@routes' }, () => {
await msw.db.version.create({ crate, num: '1.0.0' });

let error = HttpResponse.text('not found', { status: 404 });
msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => error));
await msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => error));

await page.goto('/crates/foo');
await expect(page.getByRole('link', { name: 'crates.io', exact: true })).toHaveCount(1);
Expand All @@ -37,7 +37,7 @@ test.describe('Route | crate.version | docs link', { tag: '@routes' }, () => {
doc_status: true,
version: '1.0.0',
});
msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => response));
await msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => response));

await page.goto('/crates/foo');
await expect(page.locator('[data-test-docs-link] a')).toHaveAttribute('href', 'https://docs.rs/foo/1.0.0');
Expand All @@ -51,7 +51,7 @@ test.describe('Route | crate.version | docs link', { tag: '@routes' }, () => {
await msw.db.version.create({ crate, num: '1.0.0' });

let error = HttpResponse.text('not found', { status: 404 });
msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => error));
await msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => error));

await page.goto('/crates/foo');
await expect(page.locator('[data-test-docs-link] a')).toHaveAttribute('href', 'https://docs.rs/foo/0.6.2');
Expand All @@ -68,7 +68,7 @@ test.describe('Route | crate.version | docs link', { tag: '@routes' }, () => {
doc_status: true,
version: '1.0.0',
});
msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => response));
await msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => response));

await page.goto('/crates/foo');
await expect(page.locator('[data-test-docs-link] a')).toHaveAttribute('href', 'https://docs.rs/foo/1.0.0');
Expand All @@ -79,7 +79,7 @@ test.describe('Route | crate.version | docs link', { tag: '@routes' }, () => {
await msw.db.version.create({ crate, num: '1.0.0' });

let error = HttpResponse.text('error', { status: 500 });
msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => error));
await msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => error));

await page.goto('/crates/foo');
await expect(page.locator('[data-test-docs-link] a')).toHaveAttribute('href', 'https://docs.rs/foo/0.6.2');
Expand All @@ -90,7 +90,7 @@ test.describe('Route | crate.version | docs link', { tag: '@routes' }, () => {
await msw.db.version.create({ crate, num: '0.6.2' });

let response = HttpResponse.json({});
msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => response));
await msw.worker.use(http.get('https://docs.rs/crate/:crate/:version/status.json', () => response));

await page.goto('/crates/foo');
await expect(page.locator('[data-test-docs-link] a')).toHaveAttribute('href', 'https://docs.rs/foo/0.6.2');
Expand Down
2 changes: 1 addition & 1 deletion e2e/routes/keyword.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test.describe('Route | keyword', { tag: '@routes' }, () => {

test('server error causes the error page to be shown', async ({ page, msw }) => {
let error = HttpResponse.json({}, { status: 500 });
msw.worker.use(http.get('/api/v1/crates', () => error));
await msw.worker.use(http.get('/api/v1/crates', () => error));

await page.goto('/keywords/foo');
await expect(page).toHaveURL('/keywords/foo');
Expand Down
2 changes: 1 addition & 1 deletion e2e/routes/settings/tokens/new.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ test.describe('/settings/tokens/new', { tag: '@routes' }, () => {
await prepare(msw);

let deferred = defer();
msw.worker.use(http.put('/api/v1/me/tokens', () => deferred.promise));
await msw.worker.use(http.put('/api/v1/me/tokens', () => deferred.promise));

await page.goto('/settings/tokens/new');
await expect(page).toHaveURL('/settings/tokens/new');
Expand Down
2 changes: 1 addition & 1 deletion e2e/routes/team.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test.describe('Route | team', { tag: '@routes' }, () => {
});

test('server error causes the error page to be shown', async ({ page, msw }) => {
msw.worker.use(http.get('/api/v1/teams/:id', () => HttpResponse.json({}, { status: 500 })));
await msw.worker.use(http.get('/api/v1/teams/:id', () => HttpResponse.json({}, { status: 500 })));

await page.goto('/teams/foo');
await expect(page).toHaveURL('/teams/foo');
Expand Down
2 changes: 1 addition & 1 deletion e2e/routes/user.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test.describe('Route | user', { tag: '@routes' }, () => {
});

test('server error causes the error page to be shown', async ({ page, msw }) => {
msw.worker.use(http.get('/api/v1/users/:id', () => HttpResponse.json({}, { status: 500 })));
await msw.worker.use(http.get('/api/v1/users/:id', () => HttpResponse.json({}, { status: 500 })));

await page.goto('/users/foo');
await expect(page).toHaveURL('/users/foo');
Expand Down
Loading