richie-education 2.25.0-b2.dev148 → 2.25.0-b2.dev152

package/js/widgets/UserLogin/index.not.isJoanieEnabled.spec.tsx

@@ -1,10 +1,7 @@
-import { QueryClientProvider } from '@tanstack/react-query';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import fetchMock from 'fetch-mock';
-import { IntlProvider } from 'react-intl';
 import { act } from 'react-dom/test-utils';
-import { PropsWithChildren } from 'react';
 import {
   RichieContextFactory as mockRichieContextFactory,
   UserFactory,
@@ -14,8 +11,8 @@ import context from 'utils/context';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { User } from 'types/User';
 import { HttpStatusCode } from 'utils/errors/HttpError';
-import { Nullable } from 'types/utils';
-import BaseSessionProvider from 'contexts/SessionContext/BaseSessionProvider';
+import { render } from 'utils/test/render';
+import { BaseAppWrapper } from 'utils/test/wrappers/BaseAppWrapper';
 import UserLogin from '.';
 
 jest.mock('utils/errors/handle', () => ({
@@ -41,25 +38,15 @@ jest.mock('utils/context', () => ({
 }));
 
 describe('<UserLogin />', () => {
-  const Wrapper = ({
-    children,
-    user = false,
-  }: PropsWithChildren & { user?: Nullable<User | boolean> }) => (
-    <QueryClientProvider client={createTestQueryClient({ user })}>
-      <IntlProvider locale="en">
-        <BaseSessionProvider>{children}</BaseSessionProvider>
-      </IntlProvider>
-    </QueryClientProvider>
-  );
-
   it('gets and renders the user name and a dropdown containing a logout link', async () => {
     const user: User = UserFactory({ full_name: undefined }).one();
 
-    render(
-      <Wrapper user={user}>
-        <UserLogin context={context} />
-      </Wrapper>,
-    );
+    render(<UserLogin context={context} />, {
+      wrapper: BaseAppWrapper,
+      queryOptions: {
+        client: createTestQueryClient({ user }),
+      },
+    });
 
     const button = await screen.findByLabelText(`Access to your profile settings`, {
       selector: 'button',
@@ -76,11 +63,12 @@ describe('<UserLogin />', () => {
     const loginDeferred = new Deferred();
     fetchMock.get('https://auth.test/api/user/v1/me', loginDeferred.promise);
 
-    render(
-      <Wrapper user={null}>
-        <UserLogin context={context} />
-      </Wrapper>,
-    );
+    render(<UserLogin context={context} />, {
+      wrapper: BaseAppWrapper,
+      queryOptions: {
+        client: createTestQueryClient({ user: null }),
+      },
+    });
 
     await act(async () => {
       loginDeferred.resolve(HttpStatusCode.UNAUTHORIZED);
@@ -99,11 +87,12 @@ describe('<UserLogin />', () => {
       account: { label: 'Account', action: 'https://auth.local.test/u/(username)' },
     };
 
-    render(
-      <Wrapper user={user}>
-        <UserLogin context={context} profileUrls={profileUrls} />
-      </Wrapper>,
-    );
+    render(<UserLogin context={context} profileUrls={profileUrls} />, {
+      wrapper: BaseAppWrapper,
+      queryOptions: {
+        client: createTestQueryClient({ user }),
+      },
+    });
 
     const button = await screen.findByLabelText(`Access to your profile settings`, {
       selector: 'button',

package/js/widgets/UserLogin/index.spec.tsx

@@ -1,22 +1,18 @@
-import { QueryClientProvider } from '@tanstack/react-query';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import fetchMock from 'fetch-mock';
-import { IntlProvider } from 'react-intl';
 import { act } from 'react-dom/test-utils';
-import { PropsWithChildren } from 'react';
 import {
   RichieContextFactory as mockRichieContextFactory,
   UserFactory,
 } from 'utils/test/factories/richie';
 import { Deferred } from 'utils/test/deferred';
 import context from 'utils/context';
-import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { JoanieUserApiAbilityActions, User } from 'types/User';
 import { HttpStatusCode } from 'utils/errors/HttpError';
-import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
 import { JoanieUserProfileFactory } from 'utils/test/factories/joanie';
-import { Nullable } from 'types/utils';
+import { render } from 'utils/test/render';
+import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import UserLogin from '.';
 
 jest.mock('utils/errors/handle', () => ({
@@ -45,16 +41,6 @@ jest.mock('utils/context', () => ({
 }));
 
 describe('<UserLogin />', () => {
-  const Wrapper = ({
-    children,
-    user = false,
-  }: PropsWithChildren & { user?: Nullable<User | boolean> }) => (
-    <QueryClientProvider client={createTestQueryClient({ user })}>
-      <IntlProvider locale="en">
-        <JoanieSessionProvider>{children}</JoanieSessionProvider>
-      </IntlProvider>
-    </QueryClientProvider>
-  );
   beforeEach(() => {
     fetchMock
       .get('https://endpoint.test/api/v1.0/orders/', [])
@@ -69,11 +55,9 @@ describe('<UserLogin />', () => {
     const user: User = UserFactory().one();
 
     fetchMock.get('https://endpoint.test/api/v1.0/users/me/', JoanieUserProfileFactory().one());
-    render(
-      <Wrapper user={user}>
-        <UserLogin context={context} />
-      </Wrapper>,
-    );
+    render(<UserLogin context={context} />, {
+      queryOptions: { client: createTestQueryClient({ user }) },
+    });
 
     const button = await screen.findByLabelText(`Access to your profile settings`, {
       selector: 'button',
@@ -91,11 +75,9 @@ describe('<UserLogin />', () => {
     fetchMock.get('https://auth.test/api/user/v1/me', loginDeferred.promise);
 
     fetchMock.get('https://endpoint.test/api/v1.0/users/me/', JoanieUserProfileFactory().one());
-    render(
-      <Wrapper user={null}>
-        <UserLogin context={context} />
-      </Wrapper>,
-    );
+    render(<UserLogin context={context} />, {
+      queryOptions: { client: createTestQueryClient({ user: null }) },
+    });
 
     await act(async () => {
       loginDeferred.resolve(HttpStatusCode.UNAUTHORIZED);
@@ -124,11 +106,9 @@ describe('<UserLogin />', () => {
         },
       }).one(),
     );
-    render(
-      <Wrapper user={user}>
-        <UserLogin context={context} profileUrls={profileUrls} />
-      </Wrapper>,
-    );
+    render(<UserLogin context={context} profileUrls={profileUrls} />, {
+      queryOptions: { client: createTestQueryClient({ user }) },
+    });
 
     const button = await screen.findByLabelText(`Access to your profile settings`, {
       selector: 'button',
@@ -160,11 +140,9 @@ describe('<UserLogin />', () => {
         },
       }).one(),
     );
-    render(
-      <Wrapper user={user}>
-        <UserLogin context={context} profileUrls={profileUrls} />
-      </Wrapper>,
-    );
+    render(<UserLogin context={context} profileUrls={profileUrls} />, {
+      queryOptions: { client: createTestQueryClient({ user }) },
+    });
 
     const button = await screen.findByLabelText(`Access to your profile settings`, {
       selector: 'button',

package/js/widgets/index.spec.tsx

@@ -1,9 +1,10 @@
 import type { PropsWithChildren } from 'react';
-import { IntlProvider } from 'react-intl';
-import { findByText, render } from '@testing-library/react';
+import { findByText } from '@testing-library/react';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import { handle as mockHandle } from 'utils/errors/handle';
 import { noop } from 'utils';
+import { render } from 'utils/test/render';
+import { IntlWrapper } from 'utils/test/wrappers/IntlWrapper';
 import { Root } from '.';
 
 jest.mock('utils/context', () => ({
@@ -55,11 +56,9 @@ describe('<Root />', () => {
     document.body.append(rootSearchSuggestFieldContainer);
 
     // Render the root component, passing the elements in need of frontend rendering
-    render(
-      <IntlProvider locale="en">
-        <Root richieReactSpots={[userLoginContainer, rootSearchSuggestFieldContainer]} />
-      </IntlProvider>,
-    );
+    render(<Root richieReactSpots={[userLoginContainer, rootSearchSuggestFieldContainer]} />, {
+      wrapper: IntlWrapper,
+    });
 
     await findByText(userLoginContainer, 'user login component rendered');
     await findByText(
@@ -79,11 +78,9 @@ describe('<Root />', () => {
     document.body.append(userFeedbackContainer);
 
     // Render the root component, passing our real element and our bogus one
-    render(
-      <IntlProvider locale="en">
-        <Root richieReactSpots={[userFeedbackContainer, userLoginContainer]} />
-      </IntlProvider>,
-    );
+    render(<Root richieReactSpots={[userFeedbackContainer, userLoginContainer]} />, {
+      wrapper: IntlWrapper,
+    });
 
     await findByText(userLoginContainer, 'user login component rendered');
     await findByText(userFeedbackContainer, '');
@@ -106,11 +103,9 @@ describe('<Root />', () => {
     document.body.append(searchFailingComponent);
 
     // Render the root component, passing our real element and our bogus one
-    render(
-      <IntlProvider locale="en">
-        <Root richieReactSpots={[userLoginContainer, searchFailingComponent]} />
-      </IntlProvider>,
-    );
+    render(<Root richieReactSpots={[userLoginContainer, searchFailingComponent]} />, {
+      wrapper: IntlWrapper,
+    });
 
     await findByText(userLoginContainer, 'user login component rendered');
     expect(mockHandle).toHaveBeenCalledWith(new Error('Failed to render Search component.'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "2.25.0-b2.dev148",
+  "version": "2.25.0-b2.dev152",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {