Skip to content

Commit b4f703c

Browse files
committed
test fixes
1 parent cb834f7 commit b4f703c

File tree

11 files changed

+612
-52
lines changed

11 files changed

+612
-52
lines changed

package-lock.json

Lines changed: 577 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/common/net/http-client.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ export abstract class HttpClient implements HttpClientInterface {
1212
readonly MINIMUM_SLEEP_TIME_IN_MILLISECONDS = 500;
1313
readonly RETRY_STATUS_CODES = [500, 502, 504];
1414

15-
constructor(readonly baseURL: string, readonly options?: RequestInit) {}
15+
constructor(
16+
readonly baseURL: string,
17+
readonly options?: RequestInit,
18+
) {}
1619

1720
/** The HTTP client name used for diagnostics */
1821
getClientName(): string {

src/common/utils/pagination.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('AutoPaginatable', () => {
6464
const resultPromise = paginatable.autoPagination();
6565

6666
// Fast-forward through setTimeout calls
67-
jest.advanceTimersByTimeAsync(250);
67+
await jest.advanceTimersByTimeAsync(350);
6868

6969
const result = await resultPromise;
7070

@@ -114,10 +114,10 @@ describe('AutoPaginatable', () => {
114114

115115
const resultPromise = paginatable.autoPagination();
116116

117-
jest.advanceTimersByTimeAsync(250);
117+
await jest.advanceTimersByTimeAsync(700); // 350ms * 2 for two pages
118118
await resultPromise;
119119

120-
expect(setTimeoutSpy).toHaveBeenCalledWith(expect.any(Function), 250);
120+
expect(setTimeoutSpy).toHaveBeenCalledWith(expect.any(Function), 350);
121121
});
122122

123123
it('passes through additional options to API calls', async () => {

src/directory-sync/directory-sync.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,8 @@ describe('DirectorySync', () => {
469469
it(`requests a Directory User`, async () => {
470470
fetchOnce(userWithRoleResponse);
471471

472-
const subject = await workos.directorySync.getUser(
473-
'directory_user_456',
474-
);
472+
const subject =
473+
await workos.directorySync.getUser('directory_user_456');
475474

476475
expect(subject).toEqual(userWithRole);
477476
});

src/fga/serializers/check-options.serializer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ const serializeCheckWarrantOptions = (
3636
resource_id: isResourceInterface(warrant.resource)
3737
? warrant.resource.getResourceId()
3838
: warrant.resource.resourceId
39-
? warrant.resource.resourceId
40-
: '',
39+
? warrant.resource.resourceId
40+
: '',
4141
relation: warrant.relation,
4242
subject: isSubject(warrant.subject)
4343
? {

src/fga/serializers/create-resource-options.serializer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const serializeCreateResourceOptions = (
1313
resource_id: isResourceInterface(options.resource)
1414
? options.resource.getResourceId()
1515
: options.resource.resourceId
16-
? options.resource.resourceId
17-
: '',
16+
? options.resource.resourceId
17+
: '',
1818
meta: options.meta,
1919
});

src/fga/serializers/delete-resource-options.serializer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ export const serializeDeleteResourceOptions = (
1313
resource_id: isResourceInterface(options)
1414
? options.getResourceId()
1515
: options.resourceId
16-
? options.resourceId
17-
: '',
16+
? options.resourceId
17+
: '',
1818
});

src/fga/serializers/write-warrant-options.serializer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export const serializeWriteWarrantOptions = (
1414
resource_id: isResourceInterface(warrant.resource)
1515
? warrant.resource.getResourceId()
1616
: warrant.resource.resourceId
17-
? warrant.resource.resourceId
18-
: '',
17+
? warrant.resource.resourceId
18+
: '',
1919
relation: warrant.relation,
2020
subject: isSubject(warrant.subject)
2121
? {

src/organizations/organizations.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ export class Organizations {
113113

114114
async listOrganizationFeatureFlags(
115115
options: ListOrganizationFeatureFlagsOptions,
116-
): Promise<AutoPaginatable<FeatureFlag>> {
116+
): Promise<
117+
AutoPaginatable<FeatureFlag, ListOrganizationFeatureFlagsOptions>
118+
> {
117119
const { organizationId, ...paginationOptions } = options;
118120

119121
return new AutoPaginatable(
@@ -130,7 +132,7 @@ export class Organizations {
130132
deserializeFeatureFlag,
131133
params,
132134
),
133-
paginationOptions,
135+
options,
134136
);
135137
}
136138
}

src/user-management/user-management.spec.ts

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,9 +1248,8 @@ describe('UserManagement', () => {
12481248
describe('getPasswordReset', () => {
12491249
it('sends a Get PaswordReset request', async () => {
12501250
fetchOnce(passwordResetFixture);
1251-
const passwordReset = await workos.userManagement.getPasswordReset(
1252-
passwordResetId,
1253-
);
1251+
const passwordReset =
1252+
await workos.userManagement.getPasswordReset(passwordResetId);
12541253
expect(fetchURL()).toContain(
12551254
`/user_management/password_reset/${passwordResetId}`,
12561255
);
@@ -1738,9 +1737,8 @@ describe('UserManagement', () => {
17381737
describe('getInvitation', () => {
17391738
it('sends a Get Invitation request', async () => {
17401739
fetchOnce(invitationFixture);
1741-
const invitation = await workos.userManagement.getInvitation(
1742-
invitationId,
1743-
);
1740+
const invitation =
1741+
await workos.userManagement.getInvitation(invitationId);
17441742
expect(fetchURL()).toContain(
17451743
`/user_management/invitations/${invitationId}`,
17461744
);
@@ -1754,9 +1752,8 @@ describe('UserManagement', () => {
17541752
describe('findInvitationByToken', () => {
17551753
it('sends a find invitation by token request', async () => {
17561754
fetchOnce(invitationFixture);
1757-
const invitation = await workos.userManagement.findInvitationByToken(
1758-
invitationToken,
1759-
);
1755+
const invitation =
1756+
await workos.userManagement.findInvitationByToken(invitationToken);
17601757
expect(fetchURL()).toContain(
17611758
`/user_management/invitations/by_token/${invitationToken}`,
17621759
);
@@ -1855,9 +1852,8 @@ describe('UserManagement', () => {
18551852
accepted_user_id: 'user_01HGK4K4PXNSG85RNNV0GXYP5W',
18561853
});
18571854

1858-
const response = await workos.userManagement.acceptInvitation(
1859-
invitationId,
1860-
);
1855+
const response =
1856+
await workos.userManagement.acceptInvitation(invitationId);
18611857

18621858
expect(fetchURL()).toContain(
18631859
`/user_management/invitations/${invitationId}/accept`,
@@ -1876,9 +1872,8 @@ describe('UserManagement', () => {
18761872
const invitationId = 'invitation_01H5JQDV7R7ATEYZDEG0W5PRYS';
18771873
fetchOnce(invitationFixture);
18781874

1879-
const response = await workos.userManagement.revokeInvitation(
1880-
invitationId,
1881-
);
1875+
const response =
1876+
await workos.userManagement.revokeInvitation(invitationId);
18821877

18831878
expect(fetchURL()).toContain(
18841879
`/user_management/invitations/${invitationId}/revoke`,

0 commit comments

Comments
 (0)