richie-education 2.28.2-dev39 → 2.28.2-dev58

package/js/utils/test/factories/joanie.ts

@@ -5,7 +5,6 @@ import {
   Certificate,
   CertificateDefinition,
   CertificateOrder,
-  CertificateOrderWithPaymentInfo,
   CertificateProduct,
   Contract,
   ContractDefinition,
@@ -16,7 +15,6 @@ import {
   CourseProductRelation,
   CourseRun,
   CredentialOrder,
-  CredentialOrderWithPaymentInfo,
   CredentialProduct,
   CreditCard,
   CreditCardBrand,
@@ -45,6 +43,9 @@ import { Payment, PaymentProviders } from 'components/PaymentInterfaces/types';
 import { CourseStateFactory } from 'utils/test/factories/richie';
 import { FactoryHelper } from 'utils/test/factories/helper';
 import { JoanieUserApiAbilityActions, JoanieUserProfile } from 'types/User';
+import { SaleTunnelContextType, SaleTunnelStep } from 'components/SaleTunnel/GenericSaleTunnel';
+import { SaleTunnelProps } from 'components/SaleTunnel';
+import { noop } from 'utils/index';
 import { factory } from './factories';
 
 export const UserLightFactory = factory((): UserLight => {
@@ -140,7 +141,7 @@ export const ContractFactory = factory((): Contract => {
     organization_signatory: null,
     created_on: faker.date.past().toISOString(),
     definition: ContractDefinitionFactory().one(),
-    order: NestedCredentialOrderFactory().one(),
+    order: NestedCredentialOrderFactory({ state: OrderState.TO_SIGN }).one(),
   };
 });
 
@@ -314,7 +315,7 @@ export const NestedCourseOrderFactory = factory((): NestedCourseOrder => {
     owner: UserLightFactory().one(),
     course_id: faker.string.uuid(),
     product_id: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
     enrollment_id: faker.string.uuid(),
     organization: OrganizationFactory().one(),
     certificate_id: faker.string.uuid(),
@@ -363,7 +364,7 @@ export const OrderEnrollmentFactory = factory((): OrderEnrollment => {
   return {
     id: faker.string.uuid(),
     product_id: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
@@ -375,19 +376,19 @@ export const OrderLiteFactory = factory((): OrderLite => {
     main_invoice_reference: faker.string.uuid(),
     total: faker.number.int(),
     product_id: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
 export const NestedCertificateOrderFactory = factory((): NestedCertificateOrder => {
   return {
     id: faker.string.uuid(),
-    course: undefined,
+    course: null,
     enrollment: EnrollmentLightFactory().one(),
     organization: OrganizationFactory().one(),
     product_title: FactoryHelper.unique(faker.lorem.words, { args: [1] }),
     owner_name: faker.internet.userName(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
@@ -395,11 +396,11 @@ export const NestedCredentialOrderFactory = factory((): NestedCredentialOrder =>
   return {
     id: faker.string.uuid(),
     course: CourseLightFactory().one(),
-    enrollment: undefined,
+    enrollment: null,
     organization: OrganizationFactory().one(),
     product_title: FactoryHelper.unique(faker.lorem.words, { args: [1] }),
     owner_name: faker.internet.userName(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
   };
 });
 
@@ -411,7 +412,7 @@ const AbstractOrderFactory = factory((): Order => {
     total: faker.number.int(),
     total_currency: faker.finance.currencyCode(),
     main_invoice_reference: faker.string.uuid(),
-    state: OrderState.VALIDATED,
+    state: OrderState.COMPLETED,
     product_id: faker.string.uuid(),
     target_courses: TargetCourseFactory().many(5),
     target_enrollments: [],
@@ -422,56 +423,22 @@ const AbstractOrderFactory = factory((): Order => {
   };
 });
 
-export const CredentialOrderFactory = factory((): CredentialOrder => {
-  const order = {
+export const CredentialOrderFactory = factory(
+  (): CredentialOrder => ({
     ...AbstractOrderFactory().one(),
     course: CourseLightFactory().one(),
     enrollment: null,
     payment_schedule: PaymentInstallmentFactory().many(3),
-  };
-  return order;
-});
-
-export const CredentialOrderWithPaymentFactory = factory((): CredentialOrderWithPaymentInfo => {
-  return {
-    ...CredentialOrderFactory().one(),
-    payment_info: PaymentFactory().one(),
-  };
-});
-
-export const CredentialOrderWithOneClickPaymentFactory = factory(
-  (): CredentialOrderWithPaymentInfo => {
-    return {
-      ...CredentialOrderFactory().one(),
-      payment_info: PaymentFactory().one(),
-    };
-  },
+  }),
 );
 
-export const CertificateOrderFactory = factory((): CertificateOrder => {
-  const order = {
+export const CertificateOrderFactory = factory(
+  (): CertificateOrder => ({
     ...AbstractOrderFactory().one(),
     course: null,
     target_courses: [],
     enrollment: EnrollmentLightFactory().one(),
-  };
-  return order;
-});
-
-export const CertificateOrderWithPaymentFactory = factory((): CertificateOrderWithPaymentInfo => {
-  return {
-    ...CertificateOrderFactory().one(),
-    payment_info: PaymentFactory().one(),
-  };
-});
-
-export const CertificateOrderWithOneClickPaymentFactory = factory(
-  (): CertificateOrderWithPaymentInfo => {
-    return {
-      ...CertificateOrderFactory().one(),
-      payment_info: PaymentFactory().one(),
-    };
-  },
+  }),
 );
 
 export const AddressFactory = factory((): Address => {
@@ -507,3 +474,21 @@ export const PaymentFactory = factory((): Payment => {
     url: faker.internet.url(),
   };
 });
+
+export const SaleTunnelContextFactory = factory(
+  (): SaleTunnelContextType => ({
+    webAnalyticsEventKey: 'eventKey',
+    order: CredentialOrderFactory().one(),
+    product: ProductFactory().one(),
+    props: {} as SaleTunnelProps,
+    billingAddress: undefined,
+    setBillingAddress: noop,
+    setCreditCard: noop,
+    onPaymentSuccess: noop,
+    step: SaleTunnelStep.IDLE,
+    registerSubmitCallback: noop,
+    unregisterSubmitCallback: noop,
+    runSubmitCallbacks: () => new Promise((resolve) => resolve()),
+    nextStep: noop,
+  }),
+);

package/js/widgets/Dashboard/components/DashboardItem/CourseEnrolling/index.tsx

@@ -9,7 +9,6 @@ import {
   CourseRun,
   CredentialOrder,
   Enrollment,
-  Product,
 } from 'types/Joanie';
 import { Spinner } from 'components/Spinner';
 import Banner, { BannerType } from 'components/Banner';
@@ -68,10 +67,11 @@ const messages = defineMessages({
     description: 'Text displayed when course runs list is loading',
     id: 'components.DashboardItemCourseEnrollingRun.courseRunsLoading',
   },
-  contractUnsigned: {
-    id: 'components.DashboardItemCourseEnrollingRun.contractUnsigned',
-    description: 'Message displayed as disabled button title when a contract needs to be signed.',
-    defaultMessage: 'You have to sign the training contract before enrolling to your course.',
+  cannotEnroll: {
+    id: 'components.DashboardItemCourseEnrollingRun.cannotEnroll',
+    description:
+      'Message displayed as disabled button title when the order state does not allow enrollment.',
+    defaultMessage: 'You cannot enroll yet to this training.',
   },
 });
 
@@ -81,7 +81,6 @@ interface DashboardItemCourseEnrollingProps {
   course: AbstractCourse;
   activeEnrollment?: Enrollment;
   order?: CredentialOrder;
-  product?: Product;
   writable: boolean;
   hideEnrollButtons?: boolean;
   icon?: boolean;
@@ -93,7 +92,6 @@ export const DashboardItemCourseEnrolling = ({
   activeEnrollment,
   writable,
   order,
-  product,
   icon = false,
   notEnrolledUrl = '#',
   hideEnrollButtons,
@@ -121,7 +119,6 @@ export const DashboardItemCourseEnrolling = ({
           course={course}
           enrollments={CoursesHelper.findCourseEnrollmentsInOrder(course, order)}
           order={order}
-          product={product}
         />
       )}
     </div>
@@ -132,14 +129,12 @@ interface DashboardItemCourseEnrollingRunsProps {
   course: AbstractCourse;
   enrollments: Enrollment[];
   order?: CredentialOrder;
-  product?: Product;
 }
 
 const DashboardItemCourseEnrollingRuns = ({
   course,
   enrollments,
   order,
-  product,
 }: DashboardItemCourseEnrollingRunsProps) => {
   const { enroll, isLoading, error } = useEnroll(enrollments, order);
 
@@ -176,7 +171,6 @@ const DashboardItemCourseEnrollingRuns = ({
           selected={data.selected}
           enroll={() => enroll(data.courseRun)}
           order={order}
-          product={product}
         />
       ))}
       {isLoading && (
@@ -200,7 +194,6 @@ interface DashboardItemCourseEnrollingRunProps {
   selected: boolean;
   enroll: () => void;
   order?: CredentialOrder | CertificateOrder;
-  product?: Product;
 }
 
 export const DashboardItemCourseEnrollingRun = ({
@@ -208,14 +201,11 @@ export const DashboardItemCourseEnrollingRun = ({
   selected,
   enroll,
   order,
-  product,
 }: DashboardItemCourseEnrollingRunProps) => {
   const intl = useIntl();
   const formatDate = useDateFormat();
   const courseRunPeriodMessage = useCourseRunPeriodMessage(courseRun, selected);
-  const haveToSignContract = order
-    ? OrderHelper.orderNeedsSignature(order, product?.contract_definition)
-    : false;
+  const canEnroll = OrderHelper.allowEnrollment(order);
   const isOpenedForEnrollment = useMemo(
     () => courseRun.state.priority < Priority.FUTURE_NOT_YET_OPEN,
     [courseRun],
@@ -266,11 +256,11 @@ export const DashboardItemCourseEnrollingRun = ({
       ) : (
         <div>
           <Button
-            disabled={!isOpenedForEnrollment || haveToSignContract}
+            disabled={!isOpenedForEnrollment || !canEnroll}
             color="tertiary"
             size="small"
             onClick={enroll}
-            title={haveToSignContract ? intl.formatMessage(messages.contractUnsigned) : ''}
+            title={!canEnroll ? intl.formatMessage(messages.cannotEnroll) : ''}
           >
             <FormattedMessage {...messages.enrollRun} />
           </Button>

package/js/widgets/Dashboard/components/DashboardItem/Enrollment/ProductCertificateFooter/index.spec.tsx

@@ -1,7 +1,13 @@
 import { screen, waitForElementToBeRemoved } from '@testing-library/react';
 import fetchMock from 'fetch-mock';
 import userEvent from '@testing-library/user-event';
-import { CertificateProduct, CourseLight, OrderState, ProductType } from 'types/Joanie';
+import {
+  CertificateProduct,
+  CourseLight,
+  OrderState,
+  ProductType,
+  PURCHASABLE_ORDER_STATES,
+} from 'types/Joanie';
 import {
   CourseStateFactory,
   RichieContextFactory as mockRichieContextFactory,
@@ -43,7 +49,7 @@ jest.mock('components/SaleTunnel', () => ({
         return;
       }
       setTimeout(() => {
-        const order = Factories.CertificateOrderWithOneClickPaymentFactory().one();
+        const order = Factories.CertificateOrderFactory().one();
         onFinish?.(order);
       }, 100);
     }, [isOpen]);
@@ -135,7 +141,7 @@ describe('<ProductCertificateFooter/>', () => {
   it('should display download button for a course run with certificate.', () => {
     const order = OrderEnrollmentFactory({
       certificate_id: 'FAKE_CERTIFICATE_ID',
-      state: OrderState.VALIDATED,
+      state: OrderState.COMPLETED,
       product_id: product.id,
     }).one();
     const enrollment = EnrollmentFactory({
@@ -151,35 +157,23 @@ describe('<ProductCertificateFooter/>', () => {
     expect(screen.queryByTestId('PurchaseButton__cta')).not.toBeInTheDocument();
   });
 
-  it('should not display purchase button for a course run with submitted order.', () => {
-    const order = OrderEnrollmentFactory({
-      certificate_id: undefined,
-      product_id: product.id,
-      state: OrderState.SUBMITTED,
-    }).one();
-    const enrollment = EnrollmentFactory({
-      orders: [order],
-      course_run: CourseRunFactory({ course }).one(),
-    }).one();
-    render(<ProductCertificateFooter product={product} enrollment={enrollment} />);
-    expect(screen.queryByRole('button', { name: 'Download' })).not.toBeInTheDocument();
-    expect(screen.queryByTestId('PurchaseButton__cta')).not.toBeInTheDocument();
-  });
-
-  it('should display purchase button for a course run with pending order.', () => {
-    const order = OrderEnrollmentFactory({
-      certificate_id: undefined,
-      product_id: product.id,
-      state: OrderState.PENDING,
-    }).one();
-    const enrollment = EnrollmentFactory({
-      orders: [order],
-      course_run: CourseRunFactory({ course }).one(),
-    }).one();
-    render(<ProductCertificateFooter product={product} enrollment={enrollment} />);
-    expect(screen.queryByRole('button', { name: 'Download' })).not.toBeInTheDocument();
-    expect(screen.getByTestId('PurchaseButton__cta')).toBeInTheDocument();
-  });
+  it.each(PURCHASABLE_ORDER_STATES)(
+    'should display purchase button for a course run with %s order.',
+    (state) => {
+      const order = OrderEnrollmentFactory({
+        certificate_id: undefined,
+        product_id: product.id,
+        state,
+      }).one();
+      const enrollment = EnrollmentFactory({
+        orders: [order],
+        course_run: CourseRunFactory({ course }).one(),
+      }).one();
+      render(<ProductCertificateFooter product={product} enrollment={enrollment} />);
+      expect(screen.queryByRole('button', { name: 'Download' })).not.toBeInTheDocument();
+      expect(screen.getByTestId('PurchaseButton__cta')).toBeInTheDocument();
+    },
+  );
 
   it('should not display button (download or purchase) for a course run with order but without certificate.', () => {
     const order = OrderEnrollmentFactory({

package/js/widgets/Dashboard/components/DashboardItem/Enrollment/ProductCertificateFooter/index.tsx

@@ -2,7 +2,12 @@ import { FormattedMessage, defineMessages } from 'react-intl';
 import { useState } from 'react';
 import PurchaseButton from 'components/PurchaseButton';
 import { Icon, IconTypeEnum } from 'components/Icon';
-import { CertificateProduct, Enrollment, OrderState, ProductType } from 'types/Joanie';
+import {
+  CertificateProduct,
+  Enrollment,
+  ProductType,
+  PURCHASABLE_ORDER_STATES,
+} from 'types/Joanie';
 import DownloadCertificateButton from 'components/DownloadCertificateButton';
 import { useCertificate } from 'hooks/useCertificates';
 import { isOpenedCourseRunCertificate } from 'utils/CourseRuns';
@@ -51,7 +56,7 @@ const ProductCertificateFooter = ({ product, enrollment }: ProductCertificateFoo
     <div className="dashboard-item__course-enrolling__infos">
       <div className="dashboard-item__block__status">
         <Icon name={IconTypeEnum.CERTIFICATE} />
-        {order?.state === OrderState.VALIDATED ? (
+        {OrderHelper.isActive(order) ? (
           <>
             {product.certificate_definition.title + '. '}
             <CertificateStatus certificate={certificate} productType={product.type} />
@@ -60,11 +65,11 @@ const ProductCertificateFooter = ({ product, enrollment }: ProductCertificateFoo
           <FormattedMessage {...messages.buyProductCertificateLabel} />
         )}
       </div>
-      {order?.state === OrderState.VALIDATED ? (
-        order.certificate_id && (
+      {OrderHelper.isActive(order) ? (
+        order!.certificate_id && (
           <DownloadCertificateButton
             className="dashboard-item__button"
-            certificateId={order.certificate_id}
+            certificateId={order!.certificate_id}
           />
         )
       ) : (
@@ -73,7 +78,7 @@ const ProductCertificateFooter = ({ product, enrollment }: ProductCertificateFoo
           product={product}
           enrollment={enrollment}
           buttonProps={{ size: 'small' }}
-          disabled={order?.state === OrderState.SUBMITTED}
+          disabled={order && !PURCHASABLE_ORDER_STATES.includes(order.state)}
           onFinish={(o) => {
             /**
              * As we do not refetch enrollments in DashboardCourses after SaleTunnel cache invalidation (to avoid

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.spec.tsx

@@ -22,8 +22,8 @@ import {
   CourseLightFactory,
   CourseRunFactory,
   CredentialOrderFactory,
-  CredentialOrderWithPaymentFactory,
   EnrollmentFactory,
+  PaymentFactory,
   TargetCourseFactory,
 } from 'utils/test/factories/joanie';
 import {
@@ -91,7 +91,7 @@ describe('<DashboardItemOrder/>', () => {
 
     await screen.findByRole('heading', { level: 5, name: product.title });
     await screen.findByText('Ref. ' + (order.course as CourseLight).code);
-    await screen.findByText('Pending');
+    await screen.findByText('Pending for the first direct debit');
     await screen.findByRole('link', { name: 'View details' });
   });
 
@@ -119,7 +119,7 @@ describe('<DashboardItemOrder/>', () => {
 
     await screen.findByRole('heading', { level: 5, name: product.title });
     await screen.findByText('Ref. ' + (order.course as CourseLight).code);
-    await screen.findByText('Completed');
+    await screen.findByText('Successfully completed');
     await screen.findByRole('link', { name: 'View details' });
     await expectSpinner('Loading certificate...');
     deferred.resolve(certificate);
@@ -138,7 +138,7 @@ describe('<DashboardItemOrder/>', () => {
 
     await screen.findByRole('heading', { level: 5, name: product.title });
     await screen.findByText('Ref. ' + (order.course as CourseLight).code);
-    await screen.findByText('Completed');
+    await screen.findByText('Successfully completed');
     await screen.findByRole('link', { name: 'View details' });
     await expectNoSpinner('Loading certificate ...');
   });
@@ -870,7 +870,8 @@ describe('<DashboardItemOrder/>', () => {
   });
 
   it('renders a writable order with failed payment and retry it successfully', async () => {
-    const { payment_info: paymentInfo, ...order } = CredentialOrderWithPaymentFactory().one();
+    const order = CredentialOrderFactory().one();
+    const paymentInfo = PaymentFactory().one();
 
     const validOrder = { ...order };
     validOrder.payment_schedule = [
@@ -921,7 +922,7 @@ describe('<DashboardItemOrder/>', () => {
     screen.getByText(
       /The payment failed, please choose another payment method or add a new one during the payment/,
     );
-    screen.getByText('Use another credit card during payment');
+    screen.getByText('Use another credit card');
 
     // Prepare for cache invalidation.
     fetchMock.get(

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrder.tsx

@@ -164,13 +164,16 @@ export const DashboardItemOrder = ({
     course_id: course.code,
   });
   const { product } = courseProductRelation || {};
-  const needsSignature = OrderHelper.orderNeedsSignature(order, product?.contract_definition);
+  const needsSignature = OrderHelper.orderNeedsSignature(order);
+  const canEnroll = OrderHelper.allowEnrollment(order);
+
+  if (!product) return null;
 
   return (
     <div className="dashboard-item-order">
       <DashboardItem
         data-testid={`dashboard-item-order-${order.id}`}
-        title={product?.title ?? ''}
+        title={product.title}
         code={'Ref. ' + course.code}
         imageUrl={course.cover?.src}
         more={
@@ -185,10 +188,7 @@ export const DashboardItemOrder = ({
             <div className="dashboard-item-order__footer">
               <div className="dashboard-item__block__status">
                 <Icon name={IconTypeEnum.SCHOOL} />
-                <OrderStateLearnerMessage
-                  order={order}
-                  contractDefinition={product?.contract_definition}
-                />
+                <OrderStateLearnerMessage order={order} />
               </div>
               {showDetailsButton && (
                 <RouterButton
@@ -206,7 +206,7 @@ export const DashboardItemOrder = ({
                 key={`DashboardItemOrderContract_${order.id}`}
                 title={product.title}
                 order={order}
-                contract_definition={product?.contract_definition!}
+                contract_definition={product.contract_definition!}
                 contract={order.contract}
                 writable={writable}
                 mode="compact"
@@ -224,7 +224,6 @@ export const DashboardItemOrder = ({
                   writable={writable}
                   course={targetCourse}
                   order={order}
-                  product={product}
                   activeEnrollment={CoursesHelper.findActiveCourseEnrollmentInOrder(
                     targetCourse,
                     order,
@@ -232,7 +231,7 @@ export const DashboardItemOrder = ({
                   notEnrolledUrl={generatePath(LearnerDashboardPaths.ORDER, {
                     orderId: order.id,
                   })}
-                  hideEnrollButtons={needsSignature}
+                  hideEnrollButtons={!canEnroll}
                 />
               }
             />
@@ -397,7 +396,7 @@ const ContractItem = ({ product, order }: { order: CredentialOrder; product: Pro
     return;
   }
 
-  const needsSignature = OrderHelper.orderNeedsSignature(order, product.contract_definition);
+  const needsSignature = OrderHelper.orderNeedsSignature(order);
   return (
     <div
       id={`dashboard-item-contract-${order.id}`}

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.spec.tsx

@@ -3,7 +3,7 @@ import { faker } from '@faker-js/faker';
 import { screen } from '@testing-library/react';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import { DashboardTest } from 'widgets/Dashboard/components/DashboardTest';
-import { CourseLight } from 'types/Joanie';
+import { CourseLight, OrderState } from 'types/Joanie';
 import {
   ContractDefinitionFactory,
   ContractFactory,
@@ -124,6 +124,7 @@ describe('<DashboardItemOrder/> Contract', () => {
 
     it('renders a non-writable order with a contract not signed yet', async () => {
       const order = CredentialOrderFactory({
+        state: OrderState.TO_SIGN,
         target_courses: TargetCourseFactory().many(1),
         target_enrollments: [],
         contract: ContractFactory({ student_signed_on: undefined }).one(),
@@ -186,6 +187,7 @@ describe('<DashboardItemOrder/> Contract', () => {
     });
     it('renders a writable order with a contract not signed yet', async () => {
       const order = CredentialOrderFactory({
+        state: OrderState.TO_SIGN,
         target_courses: TargetCourseFactory().many(1),
         target_enrollments: [],
         contract: null,

package/js/widgets/Dashboard/components/DashboardItem/Order/DashboardItemOrderContract.useUnionResource.cache.spec.tsx

@@ -19,6 +19,7 @@ import { render } from 'utils/test/render';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
 
 import { LearnerDashboardPaths } from 'widgets/Dashboard/utils/learnerRoutesPaths';
+import { OrderState } from 'types/Joanie';
 
 jest.mock('utils/context', () => ({
   __esModule: true,
@@ -49,9 +50,10 @@ describe('<DashboardItemOrder/> Contract', () => {
   describe('writable', () => {
     it('successfully sign a contract', async () => {
       const order = CredentialOrderFactory({
+        state: OrderState.TO_SIGN,
         target_courses: TargetCourseFactory().many(1),
         target_enrollments: [],
-        contract: ContractFactory({ student_signed_on: undefined }).one(),
+        contract: ContractFactory({ student_signed_on: null }).one(),
       }).one();
 
       // learner dashboard course page do one call to course product relation per order
@@ -82,6 +84,7 @@ describe('<DashboardItemOrder/> Contract', () => {
         `https://joanie.endpoint/api/v1.0/orders/${order.id}/submit_for_signature/`,
         submitDeferred.promise,
       );
+      fetchMock.post(`https://joanie.endpoint/api/v1.0/signature/notifications/`, 200);
 
       // delay: null is needed because as we are using fake timers it would mock the timers of
       // RTL too. See https://github.com/testing-library/user-event/issues/833.
@@ -92,11 +95,7 @@ describe('<DashboardItemOrder/> Contract', () => {
       });
 
       await expectNoSpinner('Loading orders and enrollments...');
-
-      expect(
-        await screen.findByRole('heading', { level: 5, name: product.title }),
-      ).toBeInTheDocument();
-
+      await screen.findByRole('heading', { level: 5, name: product.title });
       // Make sure the sign button is shown.
       await user.click(screen.getByRole('link', { name: 'Sign' }));
 
@@ -212,7 +211,7 @@ describe('<DashboardItemOrder/> Contract', () => {
       // We have the success message.
       await screen.findByRole('heading', { name: 'Congratulations!' });
       screen.getByText(
-        'You will receive an email once your contract will be fully signed. You can now enroll in your course runs!',
+        'You will receive an email once your contract will be fully signed. You can now finalize your subscription.',
       );
       const nextButton = screen.getByRole('button', { name: 'Next' });