Skip to content

test(shared,clerk-js): Improve coverage around fetcher params #7218

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
panteliselef merged 1 commit into from
Nov 14, 2025
Merged

test(shared,clerk-js): Improve coverage around fetcher params #7218

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
2 changes: 2 additions & 0 deletions .changeset/many-pants-pump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions ...s/clerk-js/src/ui/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@ describe('OrganizationSwitcher', () => {
props.setProps({ hidePersonal: false });
const { getAllByText, getByText, getByRole, userEvent } = render(<OrganizationSwitcher />, { wrapper });
await userEvent.click(getByRole('button'));
expect(fixtures.clerk.user?.getOrganizationMemberships).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationMemberships.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 10,
});
expect(getAllByText('Org1')).not.toBeNull();
expect(getByText('Personal account')).toBeInTheDocument();
expect(getByText('Org2')).toBeInTheDocument();
Expand Down Expand Up @@ -471,6 +476,11 @@ describe('OrganizationSwitcher', () => {
props.setProps({ hidePersonal: true });
const { getByRole, getByText, userEvent } = render(<OrganizationSwitcher />, { wrapper });
await userEvent.click(getByRole('button'));
expect(fixtures.clerk.user?.getOrganizationMemberships).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationMemberships.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 10,
});
await userEvent.click(getByText('Org2'));

expect(fixtures.clerk.setActive).toHaveBeenCalledWith(
Expand All @@ -497,6 +507,11 @@ describe('OrganizationSwitcher', () => {
fixtures.clerk.setActive.mockReturnValueOnce(Promise.resolve());
const { getByRole, getByText, userEvent } = render(<OrganizationSwitcher />, { wrapper });
await userEvent.click(getByRole('button'));
expect(fixtures.clerk.user?.getOrganizationMemberships).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationMemberships.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 10,
});
await userEvent.click(getByText(/Personal account/i));

expect(fixtures.clerk.setActive).toHaveBeenCalledWith(
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/hooks/__tests__/useCoreOrganization.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,13 @@ describe('useOrganization', () => {
expect(result.current.memberships?.count).toBe(0);

await waitFor(() => expect(result.current.memberships?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getMemberships).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.organization?.getMemberships.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
role: undefined,
query: undefined,
});

expect(result.current.memberships?.count).toBe(4);
expect(result.current.memberships?.page).toBe(1);
Expand Down Expand Up @@ -198,6 +205,13 @@ describe('useOrganization', () => {

await waitFor(() => expect(result.current.memberships?.isLoading).toBe(true));
await waitFor(() => expect(result.current.memberships?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getMemberships).toHaveBeenCalledTimes(2);
expect(fixtures.clerk.organization?.getMemberships.mock.calls[1][0]).toStrictEqual({
initialPage: 2,
pageSize: 2,
role: undefined,
query: undefined,
});

expect(result.current.memberships?.page).toBe(2);
expect(result.current.memberships?.hasNextPage).toBe(false);
Expand Down Expand Up @@ -257,6 +271,12 @@ describe('useOrganization', () => {
expect(result.current.domains?.count).toBe(0);

await waitFor(() => expect(result.current.domains?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getDomains).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.organization?.getDomains.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
enrollmentMode: undefined,
});

expect(result.current.domains?.isLoading).toBe(false);
expect(result.current.domains?.count).toBe(4);
Expand Down Expand Up @@ -298,6 +318,12 @@ describe('useOrganization', () => {

await waitFor(() => expect(result.current.domains?.isLoading).toBe(true));
await waitFor(() => expect(result.current.domains?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getDomains).toHaveBeenCalledTimes(2);
expect(fixtures.clerk.organization?.getDomains.mock.calls[1][0]).toStrictEqual({
initialPage: 2,
pageSize: 2,
enrollmentMode: undefined,
});

expect(result.current.domains?.page).toBe(2);
expect(result.current.domains?.hasNextPage).toBe(false);
Expand Down Expand Up @@ -363,6 +389,12 @@ describe('useOrganization', () => {
expect(result.current.membershipRequests?.count).toBe(0);

await waitFor(() => expect(result.current.membershipRequests?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getMembershipRequests).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.organization?.getMembershipRequests.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
status: 'pending',
});

expect(result.current.membershipRequests?.isFetching).toBe(false);
expect(result.current.membershipRequests?.count).toBe(4);
Expand Down Expand Up @@ -398,6 +430,12 @@ describe('useOrganization', () => {

await waitFor(() => expect(result.current.membershipRequests?.isLoading).toBe(true));
await waitFor(() => expect(result.current.membershipRequests?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getMembershipRequests).toHaveBeenCalledTimes(2);
expect(fixtures.clerk.organization?.getMembershipRequests.mock.calls[1][0]).toStrictEqual({
initialPage: 2,
pageSize: 2,
status: 'pending',
});

expect(result.current.membershipRequests?.page).toBe(2);
expect(result.current.membershipRequests?.hasNextPage).toBe(false);
Expand Down Expand Up @@ -467,6 +505,12 @@ describe('useOrganization', () => {
expect(result.current.invitations?.count).toBe(0);

await waitFor(() => expect(result.current.invitations?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getInvitations).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.organization?.getInvitations.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
status: ['pending'],
});

expect(result.current.invitations?.isFetching).toBe(false);
expect(result.current.invitations?.count).toBe(4);
Expand Down Expand Up @@ -498,6 +542,12 @@ describe('useOrganization', () => {

await waitFor(() => expect(result.current.invitations?.isLoading).toBe(true));
await waitFor(() => expect(result.current.invitations?.isLoading).toBe(false));
expect(fixtures.clerk.organization?.getInvitations).toHaveBeenCalledTimes(2);
expect(fixtures.clerk.organization?.getInvitations.mock.calls[1][0]).toStrictEqual({
initialPage: 2,
pageSize: 2,
status: ['pending'],
});

expect(result.current.invitations?.page).toBe(2);
expect(result.current.invitations?.hasNextPage).toBe(false);
Expand Down Expand Up @@ -566,6 +616,12 @@ describe('useOrganization', () => {

await waitFor(() => expect(result.current.invitations?.isLoading).toBe(false));
expect(result.current.invitations?.isFetching).toBe(false);
expect(fixtures.clerk.organization?.getInvitations).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.organization?.getInvitations.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
status: ['pending'],
});

const deferred = createDeferredPromise();

Expand Down Expand Up @@ -594,6 +650,15 @@ describe('useOrganization', () => {
});

await waitFor(() => expect(result.current.invitations?.isFetching).toBe(false));
const organizationInvitationParams = fixtures.clerk.organization?.getInvitations.mock.calls.map(
([params]) => params,
);
organizationInvitationParams.forEach(params => {
expect(Object.keys(params).sort()).toEqual(['initialPage', 'pageSize', 'status']);
expect(params.pageSize).toBe(2);
expect(params.status).toEqual(['pending']);
});
expect(organizationInvitationParams.some(params => params.initialPage === 2)).toBe(true);

expect(result.current.invitations?.data).toEqual(
expect.arrayContaining([
Expand Down
65 changes: 65 additions & 0 deletions packages/clerk-js/src/ui/hooks/__tests__/useCoreOrganizationList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ describe('useOrganizationList', () => {
await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));
await waitFor(() => expect(fixtures.clerk.user?.getOrganizationInvitations).toHaveBeenCalled());
await waitFor(() => expect(fixtures.clerk.user?.getOrganizationSuggestions).toHaveBeenCalled());
expect(fixtures.clerk.user?.getOrganizationMemberships).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationMemberships.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
});

expect(result.current.userMemberships.count).toBe(4);
expect(result.current.userMemberships.page).toBe(1);
Expand Down Expand Up @@ -150,6 +155,11 @@ describe('useOrganizationList', () => {

await waitFor(() => expect(result.current.userMemberships?.isLoading).toBe(true));
await waitFor(() => expect(result.current.userMemberships?.isLoading).toBe(false));
expect(fixtures.clerk.user?.getOrganizationMemberships).toHaveBeenCalledTimes(2);
expect(fixtures.clerk.user?.getOrganizationMemberships.mock.calls[1][0]).toStrictEqual({
initialPage: 2,
pageSize: 2,
});

expect(result.current.userMemberships.page).toBe(2);
expect(result.current.userMemberships.hasNextPage).toBe(false);
Expand Down Expand Up @@ -226,6 +236,11 @@ describe('useOrganizationList', () => {

await waitFor(() => expect(result.current.userMemberships.isLoading).toBe(false));
expect(result.current.userMemberships.isFetching).toBe(false);
expect(fixtures.clerk.user?.getOrganizationMemberships).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationMemberships.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
});

const deferred = createDeferredPromise();
fixtures.clerk.user?.getOrganizationMemberships.mockReturnValueOnce(deferred.promise);
Expand Down Expand Up @@ -321,6 +336,12 @@ describe('useOrganizationList', () => {
expect(result.current.userInvitations.count).toBe(0);

await waitFor(() => expect(result.current.userInvitations.isLoading).toBe(false));
expect(fixtures.clerk.user?.getOrganizationInvitations).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationInvitations.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
status: 'pending',
});

expect(result.current.userInvitations.count).toBe(4);
expect(result.current.userInvitations.page).toBe(1);
Expand All @@ -347,6 +368,12 @@ describe('useOrganizationList', () => {

await waitFor(() => expect(result.current.userInvitations?.isLoading).toBe(true));
await waitFor(() => expect(result.current.userInvitations?.isLoading).toBe(false));
expect(fixtures.clerk.user?.getOrganizationInvitations).toHaveBeenCalledTimes(2);
expect(fixtures.clerk.user?.getOrganizationInvitations.mock.calls[1][0]).toStrictEqual({
initialPage: 2,
pageSize: 2,
status: 'pending',
});

expect(result.current.userInvitations.page).toBe(2);
expect(result.current.userInvitations.hasNextPage).toBe(false);
Expand Down Expand Up @@ -408,6 +435,12 @@ describe('useOrganizationList', () => {

await waitFor(() => expect(result.current.userInvitations.isLoading).toBe(false));
expect(result.current.userInvitations.isFetching).toBe(false);
expect(fixtures.clerk.user?.getOrganizationInvitations).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationInvitations.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
status: 'pending',
});

const deferred = createDeferredPromise();
fixtures.clerk.user?.getOrganizationInvitations.mockReturnValueOnce(deferred.promise);
Expand All @@ -432,6 +465,13 @@ describe('useOrganizationList', () => {
});

await waitFor(() => expect(result.current.userInvitations.isFetching).toBe(false));
const invitationCallParams = fixtures.clerk.user?.getOrganizationInvitations.mock.calls.map(([params]) => params);
invitationCallParams.forEach(params => {
expect(Object.keys(params).sort()).toEqual(['initialPage', 'pageSize', 'status']);
expect(params.pageSize).toBe(2);
expect(params.status).toBe('pending');
});
expect(invitationCallParams.some(params => params.initialPage === 2)).toBe(true);
expect(result.current.userInvitations.data).toEqual(
expect.arrayContaining([
expect.objectContaining({
Expand Down Expand Up @@ -485,6 +525,12 @@ describe('useOrganizationList', () => {
expect(result.current.userSuggestions.count).toBe(0);

await waitFor(() => expect(result.current.userSuggestions.isLoading).toBe(false));
expect(fixtures.clerk.user?.getOrganizationSuggestions).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationSuggestions.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
status: 'pending',
});

expect(result.current.userSuggestions.count).toBe(4);
expect(result.current.userSuggestions.page).toBe(1);
Expand All @@ -511,6 +557,12 @@ describe('useOrganizationList', () => {

await waitFor(() => expect(result.current.userSuggestions.isLoading).toBe(true));
await waitFor(() => expect(result.current.userSuggestions.isLoading).toBe(false));
expect(fixtures.clerk.user?.getOrganizationSuggestions).toHaveBeenCalledTimes(2);
expect(fixtures.clerk.user?.getOrganizationSuggestions.mock.calls[1][0]).toStrictEqual({
initialPage: 2,
pageSize: 2,
status: 'pending',
});

expect(result.current.userSuggestions.page).toBe(2);
expect(result.current.userSuggestions.hasNextPage).toBe(false);
Expand Down Expand Up @@ -571,6 +623,12 @@ describe('useOrganizationList', () => {

await waitFor(() => expect(result.current.userSuggestions.isLoading).toBe(false));
expect(result.current.userSuggestions.isFetching).toBe(false);
expect(fixtures.clerk.user?.getOrganizationSuggestions).toHaveBeenCalledTimes(1);
expect(fixtures.clerk.user?.getOrganizationSuggestions.mock.calls[0][0]).toStrictEqual({
initialPage: 1,
pageSize: 2,
status: 'pending',
});

const deferred = createDeferredPromise();

Expand All @@ -595,6 +653,13 @@ describe('useOrganizationList', () => {
});

await waitFor(() => expect(result.current.userSuggestions.isFetching).toBe(false));
const suggestionCallParams = fixtures.clerk.user?.getOrganizationSuggestions.mock.calls.map(([params]) => params);
suggestionCallParams.forEach(params => {
expect(Object.keys(params).sort()).toEqual(['initialPage', 'pageSize', 'status']);
expect(params.pageSize).toBe(2);
expect(params.status).toBe('pending');
});
expect(suggestionCallParams.some(params => params.initialPage === 2)).toBe(true);
expect(result.current.userSuggestions.data).toEqual(
expect.arrayContaining([
expect.objectContaining({
Expand Down
36 changes: 36 additions & 0 deletions packages/shared/src/react/hooks/__tests__/createBillingPaginatedHook.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@ describe('createBillingPaginatedHook', () => {
expect(result.current.page).toBe(1);
expect(result.current.pageCount).toBe(3); // ceil(5/2)

expect(fetcherMock).toHaveBeenCalled();
const paramsCalls = fetcherMock.mock.calls.map(([params]) => params);
paramsCalls.forEach(params => {
expect(params).toStrictEqual({ initialPage: 1, pageSize: 2 });
});

// Simulate sign-out
mockUser = null;
rerender();
Expand Down Expand Up @@ -294,6 +300,12 @@ describe('createBillingPaginatedHook', () => {
mockUser = null;
rerender();

expect(fetcherMock).toHaveBeenCalled();
const paramsCalls = fetcherMock.mock.calls.map(([params]) => params);
paramsCalls.forEach(params => {
expect(params).toStrictEqual({ initialPage: 1, pageSize: 5 });
});

if (__CLERK_USE_RQ__) {
expect(result.current.isLoading).toBe(false);
} else {
Expand Down Expand Up @@ -336,6 +348,12 @@ describe('createBillingPaginatedHook', () => {
mockUser = null;
rerender();

expect(fetcherMock).toHaveBeenCalled();
const paramsCalls = fetcherMock.mock.calls.map(([params]) => params);
paramsCalls.forEach(params => {
expect(params).toStrictEqual({ initialPage: 1, pageSize: 2 });
});

await waitFor(() => expect(result.current.data).toEqual([]));
expect(result.current.count).toBe(0);
expect(result.current.page).toBe(1);
Expand Down Expand Up @@ -365,6 +383,12 @@ describe('createBillingPaginatedHook', () => {
const originalData = [...result.current.data];
const originalCount = result.current.count;

expect(fetcherMock).toHaveBeenCalled();
const paramsCalls = fetcherMock.mock.calls.map(([params]) => params);
paramsCalls.forEach(params => {
expect(params).toStrictEqual({ initialPage: 1, pageSize: 2 });
});

// Simulate sign-out
mockUser = null;
rerender();
Expand Down Expand Up @@ -411,6 +435,12 @@ describe('createBillingPaginatedHook', () => {
mockUser = null;
rerender();

expect(fetcherMock).toHaveBeenCalled();
const paramsCalls = fetcherMock.mock.calls.map(([params]) => params);
paramsCalls.forEach(params => {
expect(params).toStrictEqual({ initialPage: 1, pageSize: 5 });
});

// Data should persist for unauthenticated hooks even with keepPreviousData: true
expect(result.current.data).toEqual(originalData);
expect(result.current.count).toBe(20);
Expand Down Expand Up @@ -443,6 +473,12 @@ describe('createBillingPaginatedHook', () => {
mockUser = null;
rerender();

expect(fetcherMock).toHaveBeenCalled();
const paramsCalls = fetcherMock.mock.calls.map(([params]) => params);
paramsCalls.forEach(params => {
expect(params).toStrictEqual({ initialPage: 1, pageSize: 2 });
});

// Data should persist for unauthenticated hooks
expect(result.current.data).toEqual(originalData);
expect(result.current.count).toBe(originalCount);
Expand Down
Loading
Loading