test(clerk-js): Remove legacy roles fallback (#2387)

* test(clerk-js): Remove legacy roles fallback * test(clerk-js): Remove legacy roles fallback
clerk · Dec 18, 2023 · c64ae68 · c64ae68
1 parent 35f406e
commit c64ae68
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 13 deletions.
diff --git a/.changeset/perfect-ants-joke.md b/.changeset/perfect-ants-joke.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/__tests__/InviteMembersPage.test.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/__tests__/InviteMembersPage.test.tsx
@@ -36,7 +36,23 @@ describe('InviteMembersPage', () => {
         });
       });
 
-      fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+      fixtures.clerk.organization?.getRoles.mockResolvedValue({
+        total_count: 1,
+        data: [
+          {
+            pathRoot: '',
+            reload: jest.fn(),
+            id: 'member',
+            key: 'member',
+            name: 'member',
+            description: '',
+            permissions: [],
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+        ],
+      });
+
       const { getByText, getByRole, userEvent, getByTestId } = render(<InviteMembersPage />, { wrapper });
       expect(getByRole('button', { name: 'Send invitations' })).toBeDisabled();
 
@@ -58,18 +74,34 @@ describe('InviteMembersPage', () => {
         });
       });
 
-      fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+      fixtures.clerk.organization?.getRoles.mockResolvedValue({
+        total_count: 2,
+        data: [
+          {
+            pathRoot: '',
+            reload: jest.fn(),
+            id: 'member',
+            key: 'member',
+            name: 'member',
+            description: '',
+            permissions: [],
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+        ],
+      });
+
       fixtures.clerk.organization?.inviteMembers.mockResolvedValueOnce([{}] as OrganizationInvitationResource[]);
       const { getByRole, userEvent, getByTestId, getByText } = render(<InviteMembersPage />, { wrapper });
       await userEvent.type(getByTestId('tag-input'), 'test+1@clerk.com,');
       await userEvent.click(getByRole('button', { name: 'Select an option' }));
-      await userEvent.click(getByText('Member'));
+      await userEvent.click(getByText(/^member$/i));
       await userEvent.click(getByRole('button', { name: 'Send invitations' }));
 
       await waitFor(() => {
         expect(fixtures.clerk.organization?.inviteMembers).toHaveBeenCalledWith({
           emailAddresses: ['test+1@clerk.com'],
-          role: 'basic_member' as MembershipRole,
+          role: 'member' as MembershipRole,
         });
       });
     });
@@ -123,21 +155,37 @@ describe('InviteMembersPage', () => {
         });
       });
 
-      fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+      fixtures.clerk.organization?.getRoles.mockResolvedValue({
+        total_count: 2,
+        data: [
+          {
+            pathRoot: '',
+            reload: jest.fn(),
+            id: 'member',
+            key: 'member',
+            name: 'member',
+            description: '',
+            permissions: [],
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+        ],
+      });
+
       fixtures.clerk.organization?.inviteMembers.mockResolvedValueOnce([{}] as OrganizationInvitationResource[]);
       const { getByRole, userEvent, getByTestId, getByText } = render(<InviteMembersPage />, { wrapper });
       await userEvent.type(
         getByTestId('tag-input'),
         'test+1@clerk.com,test+2@clerk.com,test+3@clerk.com,test+4@clerk.com,',
       );
       await userEvent.click(getByRole('button', { name: 'Select an option' }));
-      await userEvent.click(getByText('Member'));
+      await userEvent.click(getByText(/^member$/i));
       await userEvent.click(getByRole('button', { name: 'Send invitations' }));
 
       await waitFor(() => {
         expect(fixtures.clerk.organization?.inviteMembers).toHaveBeenCalledWith({
           emailAddresses: ['test+1@clerk.com', 'test+2@clerk.com', 'test+3@clerk.com', 'test+4@clerk.com'],
-          role: 'basic_member' as MembershipRole,
+          role: 'member' as MembershipRole,
         });
       });
     });
@@ -151,7 +199,23 @@ describe('InviteMembersPage', () => {
         });
       });
 
-      fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+      fixtures.clerk.organization?.getRoles.mockResolvedValue({
+        total_count: 2,
+        data: [
+          {
+            pathRoot: '',
+            reload: jest.fn(),
+            id: 'admin',
+            key: 'admin',
+            name: 'Admin',
+            description: '',
+            permissions: [],
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+        ],
+      });
+
       fixtures.clerk.organization?.inviteMembers.mockResolvedValueOnce([{}] as OrganizationInvitationResource[]);
       const { getByRole, userEvent, getByText, getByTestId } = render(<InviteMembersPage />, { wrapper });
       await userEvent.type(getByTestId('tag-input'), 'test+1@clerk.com,');
@@ -175,7 +239,23 @@ describe('InviteMembersPage', () => {
         });
       });
 
-      fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+      fixtures.clerk.organization?.getRoles.mockResolvedValue({
+        total_count: 2,
+        data: [
+          {
+            pathRoot: '',
+            reload: jest.fn(),
+            id: 'member',
+            key: 'member',
+            name: 'member',
+            description: '',
+            permissions: [],
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+        ],
+      });
+
       fixtures.clerk.organization?.inviteMembers.mockRejectedValueOnce(
         new ClerkAPIResponseError('Error', {
           data: [
@@ -213,7 +293,23 @@ describe('InviteMembersPage', () => {
         });
       });
 
-      fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+      fixtures.clerk.organization?.getRoles.mockResolvedValue({
+        total_count: 2,
+        data: [
+          {
+            pathRoot: '',
+            reload: jest.fn(),
+            id: 'member',
+            key: 'member',
+            name: 'member',
+            description: '',
+            permissions: [],
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+        ],
+      });
+
       fixtures.clerk.organization?.inviteMembers.mockRejectedValueOnce(
         new ClerkAPIResponseError('Error', {
           data: [
@@ -247,7 +343,23 @@ describe('InviteMembersPage', () => {
         });
       });
 
-      fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+      fixtures.clerk.organization?.getRoles.mockResolvedValue({
+        total_count: 2,
+        data: [
+          {
+            pathRoot: '',
+            reload: jest.fn(),
+            id: 'member',
+            key: 'member',
+            name: 'member',
+            description: '',
+            permissions: [],
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+        ],
+      });
+
       fixtures.clerk.organization?.inviteMembers.mockRejectedValueOnce(
         new ClerkAPIResponseError('Error', {
           data: [

diff --git a/...ges/clerk-js/src/ui/components/OrganizationProfile/__tests__/OrganizationMembers.test.tsx b/...ges/clerk-js/src/ui/components/OrganizationProfile/__tests__/OrganizationMembers.test.tsx
@@ -134,7 +134,7 @@ describe('OrganizationMembers', () => {
       createFakeMember({
         id: '2',
         orgId: '1',
-        role: 'basic_member',
+        role: 'member',
         identifier: 'test_user2',
         firstName: 'First2',
         lastName: 'Last2',
@@ -172,7 +172,33 @@ describe('OrganizationMembers', () => {
       }),
     );
 
-    fixtures.clerk.organization?.getRoles.mockRejectedValue(null);
+    fixtures.clerk.organization?.getRoles.mockResolvedValue({
+      total_count: 2,
+      data: [
+        {
+          pathRoot: '',
+          reload: jest.fn(),
+          id: 'member',
+          key: 'member',
+          name: 'Member',
+          description: '',
+          permissions: [],
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+        {
+          pathRoot: '',
+          reload: jest.fn(),
+          id: 'admin',
+          key: 'admin',
+          name: 'Admin',
+          description: '',
+          permissions: [],
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      ],
+    });
 
     const { container, queryByText, queryAllByRole } = render(<OrganizationMembers />, { wrapper });