Skip to content

fix test coverage #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auniverseaway merged 1 commit into from
Jul 22, 2025
Merged

fix test coverage #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 1 addition & 12 deletions test/storage/object/delete.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
import assert from 'node:assert';
import esmock from 'esmock';
import { mockClient } from 'aws-sdk-client-mock';
import { DeleteObjectCommand, ListObjectsV2Command, S3Client } from '@aws-sdk/client-s3';
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
import { ListObjectsV2Command, S3Client } from '@aws-sdk/client-s3';

const s3Mock = mockClient(S3Client);

Expand Down Expand Up @@ -252,11 +251,6 @@ describe('Object delete', () => {
getSignedUrl: mockSignedUrl,
}
},
{
import: {
fetch: async () => ({ status: 200 }),
}
}
);
s3Mock.on(ListObjectsV2Command).resolves({ Contents: [{ Key: 'foo/bar.html' }] });
const resp = await deleteObjects(env, daCtx, {});
Expand Down Expand Up @@ -287,11 +281,6 @@ describe('Object delete', () => {
getSignedUrl: mockSignedUrl,
}
},
{
import: {
fetch: async () => ({ status: 200 }),
}
}
);
s3Mock.on(ListObjectsV2Command).resolves({ Contents: [{ Key: 'foo/bar.html' }], NextContinuationToken: 'token' });
const resp = await deleteObjects(env, daCtx, {});
Expand Down
34 changes: 26 additions & 8 deletions test/utils/auth.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,17 @@ import {
const {
setUser,
getUsers,
} = await esmock('../../src/utils/auth.js', { jose, import: { fetch } });
} = await esmock('../../src/utils/auth.js', { jose });

async function withMockedFetch(act) {
const savedFetch = globalThis.fetch;
globalThis.fetch = fetch;
try {
await act();
} finally {
globalThis.fetch = savedFetch;
}
}

describe('DA auth', () => {
describe('get user', async () => {
Expand All @@ -49,14 +59,18 @@ describe('DA auth', () => {
});

it('authorized if email matches', async () => {
const users = await getUsers(reqs.site, env);
assert.strictEqual(users[0].email, 'aparker@geometrixx.info');
await withMockedFetch(async () => {
const users = await getUsers(reqs.site, env);
assert.strictEqual(users[0].email, 'aparker@geometrixx.info');
});
});

it('authorized with user if email matches and anonymous if present', async () => {
const users = await getUsers(reqs.siteMulti, env);
assert.strictEqual(users[0].email, 'anonymous')
assert.strictEqual(users[1].email, 'aparker@geometrixx.info');
await withMockedFetch(async () => {
const users = await getUsers(reqs.siteMulti, env);
assert.strictEqual(users[0].email, 'anonymous')
assert.strictEqual(users[1].email, 'aparker@geometrixx.info');
});
});

it('anonymous if ims fails', async () => {
Expand All @@ -71,8 +85,12 @@ describe('DA auth', () => {
'Authorization': `Bearer aparker@geometrixx.info`,
});

const userValStr = await setUser('aparker@geometrixx.info', 100, headers, env);
const userValue = JSON.parse(userValStr);
let userValue;

await withMockedFetch(async () => {
const userValStr = await setUser('aparker@geometrixx.info', 100, headers, env);
userValue = JSON.parse(userValStr);
});

assert.strictEqual('aparker@geometrixx.info', userValue.email);
assert.strictEqual('123', userValue.ident);
Expand Down