richie-education 2.28.2-dev39 → 2.28.2-dev53

package/js/components/SaleTunnel/index.spec.tsx

@@ -1,40 +1,38 @@
-import { act, cleanup, fireEvent, screen, waitFor } from '@testing-library/react';
+import { act, cleanup, screen, waitFor } from '@testing-library/react';
 import fetchMock from 'fetch-mock';
 import queryString from 'query-string';
 import userEvent from '@testing-library/user-event';
 import { within } from '@testing-library/dom';
 import { createIntl } from 'react-intl';
-import { OrderState, Product, ProductType } from 'types/Joanie';
+import { useState } from 'react';
+import { OrderState, Product, ProductType, NOT_CANCELED_ORDER_STATES } from 'types/Joanie';
+import {
+  RichieContextFactory as mockRichieContextFactory,
+  UserFactory,
+  PacedCourseFactory,
+} from 'utils/test/factories/richie';
 import {
   AddressFactory,
-  CertificateOrderWithOneClickPaymentFactory,
-  CertificateOrderWithPaymentFactory,
+  CertificateOrderFactory,
   CertificateProductFactory,
-  CredentialOrderWithOneClickPaymentFactory,
-  CredentialOrderWithPaymentFactory,
+  CredentialOrderFactory,
   CredentialProductFactory,
   CreditCardFactory,
   EnrollmentFactory,
   PaymentInstallmentFactory,
 } from 'utils/test/factories/joanie';
-import {
-  RichieContextFactory as mockRichieContextFactory,
-  PacedCourseFactory,
-  UserFactory,
-} from 'utils/test/factories/richie';
 import { render } from 'utils/test/render';
 import { SaleTunnel, SaleTunnelProps } from 'components/SaleTunnel/index';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
-import { HttpStatusCode } from 'utils/errors/HttpError';
+import { HttpError, HttpStatusCode } from 'utils/errors/HttpError';
 import { getAddressLabel } from 'components/SaleTunnel/AddressSelector';
-import { ObjectHelper } from 'utils/ObjectHelper';
-import { PAYMENT_SETTINGS } from 'settings';
 import { User } from 'types/User';
 import { OpenEdxApiProfile } from 'types/openEdx';
 import { OpenEdxApiProfileFactory } from 'utils/test/factories/openEdx';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { StringHelper } from 'utils/StringHelper';
 import { DEFAULT_DATE_FORMAT } from 'hooks/useDateFormat';
+import { Deferred } from 'utils/test/deferred';
 
 jest.mock('utils/context', () => ({
   __esModule: true,
@@ -55,648 +53,322 @@ jest.mock('utils/indirection/window', () => ({
   }),
 }));
 
-jest.mock('../PaymentInterfaces');
+jest.mock('./SaleTunnelSavePaymentMethod', () => ({
+  __esModule: true,
+  default: () => <div data-testid="sale-tunnel-save-payment-method-step" />,
+}));
+jest.mock('components/ContractFrame/LearnerContractFrame', () => ({
+  __esModule: true,
+  default: () => <div data-testid="sale-tunnel-sign-step" />,
+}));
 
 describe.each([
   {
     productType: ProductType.CREDENTIAL,
     ProductFactory: CredentialProductFactory,
-    OrderWithOneClickPaymentFactory: CredentialOrderWithOneClickPaymentFactory,
-    OrderWithPaymentFactory: CredentialOrderWithPaymentFactory,
+    OrderFactory: CredentialOrderFactory,
   },
   {
     productType: ProductType.CERTIFICATE,
     ProductFactory: CertificateProductFactory,
-    OrderWithOneClickPaymentFactory: CertificateOrderWithOneClickPaymentFactory,
-    OrderWithPaymentFactory: CertificateOrderWithPaymentFactory,
+    OrderFactory: CertificateOrderFactory,
   },
-])(
-  'SaleTunnel for $productType product',
-  ({ productType, ProductFactory, OrderWithOneClickPaymentFactory, OrderWithPaymentFactory }) => {
-    let nbApiCalls: number;
-
-    const course = PacedCourseFactory().one();
-    const enrollment =
-      productType === ProductType.CERTIFICATE
-        ? EnrollmentFactory({ course_run: { course } }).one()
-        : undefined;
-
-    let richieUser: User;
-    let openApiEdxProfile: OpenEdxApiProfile;
-
-    const formatPrice = (price: number, currency: string) =>
-      new Intl.NumberFormat('en', {
-        currency,
-        style: 'currency',
-      }).format(price);
-
-    const Wrapper = (props: Omit<SaleTunnelProps, 'isOpen' | 'onClose'>) => {
-      return (
-        <SaleTunnel
-          {...props}
-          enrollment={enrollment}
-          course={productType === ProductType.CREDENTIAL ? course : undefined}
-          isOpen={true}
-          onClose={() => {}}
-        />
-      );
-    };
-
-    beforeEach(() => {
-      jest.useFakeTimers();
-      jest.clearAllTimers();
-      jest.resetAllMocks();
-
-      fetchMock.restore();
-      sessionStorage.clear();
-
-      nbApiCalls = 3;
-
-      richieUser = UserFactory().one();
-      openApiEdxProfile = OpenEdxApiProfileFactory({
-        username: richieUser.username,
-        email: richieUser.email,
-        name: richieUser.full_name,
-      }).one();
-
-      const { 'pref-lang': prefLang, ...openEdxAccount } = openApiEdxProfile;
-
-      fetchMock.get(
-        `https://auth.test/api/user/v1/accounts/${richieUser.username}`,
-        openEdxAccount,
-      );
-      fetchMock.get(`https://auth.test/api/user/v1/preferences/${richieUser.username}`, {
-        'pref-lang': prefLang,
-      });
+])('SaleTunnel for $productType product', ({ productType, ProductFactory, OrderFactory }) => {
+  let nbApiCalls: number;
+
+  const course = PacedCourseFactory().one();
+  const enrollment =
+    productType === ProductType.CERTIFICATE
+      ? EnrollmentFactory({ course_run: { course } }).one()
+      : undefined;
+
+  let richieUser: User;
+  let openApiEdxProfile: OpenEdxApiProfile;
+
+  const formatPrice = (price: number, currency: string) =>
+    new Intl.NumberFormat('en', {
+      currency,
+      style: 'currency',
+    }).format(price);
+
+  const Wrapper = (props: Omit<SaleTunnelProps, 'isOpen' | 'onClose'>) => {
+    const [open, setOpen] = useState(true);
+    return (
+      <SaleTunnel
+        {...props}
+        enrollment={enrollment}
+        course={productType === ProductType.CREDENTIAL ? course : undefined}
+        isOpen={open}
+        onClose={() => setOpen(false)}
+      />
+    );
+  };
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    jest.clearAllTimers();
+    jest.resetAllMocks();
+
+    fetchMock.restore();
+    sessionStorage.clear();
+
+    nbApiCalls = 3;
+
+    richieUser = UserFactory().one();
+    openApiEdxProfile = OpenEdxApiProfileFactory({
+      username: richieUser.username,
+      email: richieUser.email,
+      name: richieUser.full_name,
+    }).one();
+
+    const { 'pref-lang': prefLang, ...openEdxAccount } = openApiEdxProfile;
+
+    fetchMock.get(`https://auth.test/api/user/v1/accounts/${richieUser.username}`, openEdxAccount);
+    fetchMock.get(`https://auth.test/api/user/v1/preferences/${richieUser.username}`, {
+      'pref-lang': prefLang,
     });
+  });
 
-    setupJoanieSession();
+  setupJoanieSession();
 
-    afterEach(() => {
-      act(() => {
-        jest.runOnlyPendingTimers();
-      });
-      jest.useRealTimers();
-      cleanup();
+  afterEach(() => {
+    act(() => {
+      jest.runOnlyPendingTimers();
     });
-
-    const getFetchOrderQueryParams = (product: Product) => {
-      return product.type === ProductType.CREDENTIAL
-        ? {
-            course_code: course.code,
-            product_id: product.id,
-            state: ['pending', 'validated', 'submitted'],
-          }
-        : {
-            enrollment_id: enrollment?.id,
-            product_id: product.id,
-            state: ['pending', 'validated', 'submitted'],
-          };
-    };
-
-    it('should create an order only the first time the payment interface is shown, and not after aborting', async () => {
-      const product = ProductFactory().one();
-      const billingAddress = AddressFactory({
-        is_main: true,
-      }).one();
-      const { payment_info: paymentInfo, ...order } = OrderWithPaymentFactory().one();
-
-      fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          [],
-        )
-        .post('https://joanie.endpoint/api/v1.0/orders/', order)
-        .patch(`https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`, {
-          paymentInfo,
-        })
-        .get(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`, {
-          ...order,
-        })
-        .post(`https://joanie.endpoint/api/v1.0/orders/${order.id}/abort/`, HttpStatusCode.OK)
-        .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
-          overwriteRoutes: true,
-        });
-
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
-      });
-      nbApiCalls += 1; // useProductOrder call.
-      nbApiCalls += 1; // get user account call.
-      nbApiCalls += 1; // get user preferences call.
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
-
-      const $terms = screen.getByLabelText(
-        'By checking this box, you accept the General Terms of Sale',
-      );
-      const user = userEvent.setup({ delay: null });
-      await user.click($terms);
-
-      const $button = screen.getByRole<HTMLButtonElement>('button', {
-        name: `Subscribe`,
-      });
-      nbApiCalls += 1; // product payment-schedule call
-
-      // - Payment button should not be disabled.
-      expect($button.disabled).toBe(false);
-
-      // - wait for address to be loaded.
-      await screen.findByText(getAddressLabel(billingAddress));
-
-      // - Order should not have been submitted yet
-      expect(
-        fetchMock
-          .calls()
-          .filter(
-            (call) => call[0] === `https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`,
-          ),
-      ).toHaveLength(0);
-
-      // - User clicks on pay button
-      await user.click($button);
-
-      // - Route to create order should have been called
-      nbApiCalls += 1; // order post create (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from create)
-      nbApiCalls += 1; // order submit (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from submit)
-
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
-      expect(fetchMock.lastUrl()).toBe(
+    jest.useRealTimers();
+    cleanup();
+  });
+
+  const getFetchOrderQueryParams = (product: Product) => {
+    return product.type === ProductType.CREDENTIAL
+      ? {
+          course_code: course.code,
+          product_id: product.id,
+          state: NOT_CANCELED_ORDER_STATES,
+        }
+      : {
+          enrollment_id: enrollment?.id,
+          product_id: product.id,
+          state: NOT_CANCELED_ORDER_STATES,
+        };
+  };
+
+  it('should create an order when the user clicks on subscribe button', async () => {
+    const product = ProductFactory().one();
+    const billingAddress = AddressFactory({
+      is_main: true,
+    }).one();
+    const order = OrderFactory({ state: OrderState.TO_SAVE_PAYMENT_METHOD }).one();
+
+    fetchMock
+      .get(
         `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-      );
-
-      // - Order should have been submitted once
-      expect(
-        fetchMock
-          .calls()
-          .filter(
-            (call) => call[0] === `https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`,
-          ),
-      ).toHaveLength(1);
-
-      // - Spinner should be displayed
-      screen.getByText('Payment in progress');
-
-      // - Payment interface should be displayed
-      screen.getByText('Payment interface component');
-
-      // - Simulate the payment aborting.
-      fetchMock.get(
-        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-        [
-          {
-            ...order,
-            state: OrderState.PENDING,
-          },
-        ],
-        { overwriteRoutes: true },
-      );
-
-      await user.click(screen.getByTestId('payment-abort'));
-
-      nbApiCalls += 1; // abort order.
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from create)
-
-      await waitFor(() => {
-        expect(fetchMock.calls()).toHaveLength(nbApiCalls);
+        [],
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
+        [],
+      )
+      .post('https://joanie.endpoint/api/v1.0/orders/', order)
+      .get(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`, order)
+      .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
+        overwriteRoutes: true,
       });
-      expect(fetchMock.calls()[fetchMock.calls().length - 3][0]).toBe(
-        `https://joanie.endpoint/api/v1.0/orders/${order.id}/abort/`,
-      );
-      expect(fetchMock.calls()[fetchMock.calls().length - 1][0]).toBe(
-        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-      );
-
-      screen.getByText('You have aborted the payment.');
-
-      // - User clicks on pay button again.
-      await user.click($button);
-
-      // - Spinner should be displayed
-      await screen.findByText('Payment in progress');
-
-      // - Payment interface should be displayed
-      await screen.findByText('Payment interface component');
 
-      // - Now we make sure the order is not created again and just submitted.
-      nbApiCalls += 1; // order submit (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from submit)
+    render(<Wrapper product={product} />, {
+      queryOptions: { client: createTestQueryClient({ user: richieUser }) },
+    });
+    nbApiCalls += 1; // useProductOrder call.
+    nbApiCalls += 1; // get user account call.
+    nbApiCalls += 1; // get user preferences call.
+    nbApiCalls += 1; // product payment-schedule call
+    await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
 
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
+    const user = userEvent.setup({ delay: null });
 
-      // - Order should not have been re-submitted
-      expect(
-        fetchMock
-          .calls()
-          .filter(
-            (call) => call[0] === `https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`,
-          ),
-      ).toHaveLength(2);
-      expect(fetchMock.lastUrl()).toBe(
-        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-      );
+    const $button = screen.getByRole<HTMLButtonElement>('button', {
+      name: `Subscribe`,
     });
 
-    it('should render a payment button and not call the order creation route when there is a pending order', async () => {
-      const product = ProductFactory().one();
-      const billingAddress = AddressFactory({
-        is_main: true,
-      }).one();
-      const creditCard = CreditCardFactory().one();
-      const { payment_info: paymentInfo, ...order } = OrderWithOneClickPaymentFactory().one();
+    // - wait for address to be loaded.
+    await screen.findByText(getAddressLabel(billingAddress));
 
-      const initialOrder = {
-        ...order,
-        state: OrderState.PENDING,
-      };
-      const orderSubmitted = {
-        ...order,
-        state: OrderState.SUBMITTED,
-      };
+    // - Subscribe button should not be disabled.
+    expect($button.disabled).toBe(false);
 
+    // - Order should not have been created yet
+    expect(
       fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [initialOrder],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          [],
-        )
-        .post('https://joanie.endpoint/api/v1.0/orders/', order)
-        .patch(`https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`, {
-          payment_info: paymentInfo,
-        })
-        .get(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`, orderSubmitted)
-        .get('https://joanie.endpoint/api/v1.0/credit-cards/', [creditCard], {
-          overwriteRoutes: true,
-        })
-        .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
-          overwriteRoutes: true,
-        });
-
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
-      });
-      await waitFor(() => {
-        expect(screen.getByTestId('payment-button-order-loaded')).toBeInTheDocument();
-      });
-
-      const user = userEvent.setup({ delay: null });
-      const $terms = screen.getByLabelText(
-        'By checking this box, you accept the General Terms of Sale',
-      );
-      await user.click($terms);
-
-      nbApiCalls += 1; // useProductOrder get order with filters
-      nbApiCalls += 1; // get user account call.
-      nbApiCalls += 1; // get user preferences call.
-      nbApiCalls += 1; // product payment schedule call.
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
-      const $button = screen.getByRole('button', {
-        name: `Subscribe`,
-      }) as HTMLButtonElement;
-
-      // - Payment button should not be disabled.
-      expect($button.disabled).toBe(false);
-
-      // - wait for address to be loaded.
-      await screen.findByText(getAddressLabel(billingAddress));
-
-      // - User clicks on Subscribe button
-      fetchMock.get(
-        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-        [orderSubmitted],
-        { overwriteRoutes: true },
-      );
-      await user.click($button);
-
-      // - In real world condition the success callback is immediately called for one click payments.
-      // - but here we need to click manually.
-      const $success = await screen.findByTestId('payment-success');
-      await user.click($success);
-
-      // - Route to submit an existing order
-      // - Furthermore, as payment succeeded immediately, order should have been refetched
-      nbApiCalls += 1; // order submit
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from submit)
-      nbApiCalls += 1; // order get on id
-      expect(fetchMock.calls()).toHaveLength(nbApiCalls);
-
-      const submitCall = fetchMock
         .calls()
-        .find((call) => call[0] === `https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`);
-      expect(submitCall).not.toBeUndefined();
-      expect(JSON.parse(submitCall![1]!.body as string)).toEqual({
-        billing_address: ObjectHelper.omit(billingAddress, 'id', 'is_main'),
-        credit_card_id: creditCard.id,
-      });
-      expect(fetchMock.lastUrl()).toBe(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`);
-
-      // - Spinner should be displayed
-      screen.getByText('Payment in progress');
-
-      // - Order should be polled until its state is validated
-      fetchMock.get(
-        `https://joanie.endpoint/api/v1.0/orders/${order.id}/`,
-        {
-          ...order,
-          state: OrderState.VALIDATED,
-        },
-        {
-          overwriteRoutes: true,
-        },
-      );
-
-      // - Advance timer to one tick
-      await act(async () => {
-        jest.runOnlyPendingTimers();
-      });
-
-      // - Order should have been refetched
-      nbApiCalls += 1; // order get on id
-      nbApiCalls += 1; // orders get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from success)
-      nbApiCalls += 1; // orders get (invalidate queries)
-      expect(fetchMock.calls()).toHaveLength(nbApiCalls);
-
-      // - As order state is validated, success step is displayed
-      screen.getByTestId('generic-sale-tunnel-success-step');
-      screen.getByText('Congratulations!');
-      // - And poller should be stopped
-      await act(async () => {
-        jest.runOnlyPendingTimers();
-      });
-      expect(fetchMock.calls()).toHaveLength(nbApiCalls);
-    });
-
-    it('should render SaleTunnelNotValidated if order is not validated after a given delay', async () => {
-      const product = ProductFactory().one();
-      const billingAddress = AddressFactory({
-        is_main: true,
-      }).one();
-      const creditCard = CreditCardFactory().one();
-      const { payment_info: paymentInfo, ...order } = OrderWithOneClickPaymentFactory().one();
-      const orderSubmitted = {
-        ...order,
-        state: OrderState.SUBMITTED,
-      };
-
+        .filter(
+          ([url, metadata]) =>
+            url === 'https://joanie.endpoint/api/v1.0/orders/' && metadata?.method === 'POST',
+        ),
+    ).toHaveLength(0);
+
+    // - User clicks on pay button
+    await user.click($button);
+
+    fetchMock.get(
+      `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
+      [order],
+      { overwriteRoutes: true },
+    );
+
+    // - Route to create order should have been called
+    nbApiCalls += 1; // order create
+    nbApiCalls += 1; // order get (invalidate queries)
+    nbApiCalls += 1; // useProductOrder call (invalidate from create)
+
+    await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
+    expect(fetchMock.lastUrl()).toBe(
+      `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
+    );
+
+    // - Order should have been created once
+    expect(
       fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [orderSubmitted],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          [],
-        )
-        .post('https://joanie.endpoint/api/v1.0/orders/', order)
-        .patch(`https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`, {
-          payment_info: paymentInfo,
-        })
-        .get(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`, orderSubmitted)
-        .post(`https://joanie.endpoint/api/v1.0/orders/${order.id}/abort/`, HttpStatusCode.OK)
-        .get('https://joanie.endpoint/api/v1.0/credit-cards/', [creditCard], {
-          overwriteRoutes: true,
-        })
-        .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
-          overwriteRoutes: true,
-        });
-
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
-      });
-      await waitFor(() => {
-        expect(screen.getByTestId('payment-button-order-loaded')).toBeInTheDocument();
-      });
-      nbApiCalls += 1; // fetcher order for userProductOrder
-      nbApiCalls += 1; // get user account call.
-      nbApiCalls += 1; // get user preferences call.
-      nbApiCalls += 1; // get product payment schedule.
-      const apiCalls = fetchMock.calls().map((call) => call[0]);
-      expect(apiCalls).toContain(
-        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-      );
-
-      const $terms = screen.getByLabelText(
-        'By checking this box, you accept the General Terms of Sale',
-      );
-      const user = userEvent.setup({ delay: null });
-      await user.click($terms);
-
-      const $button = screen.getByRole('button', {
-        name: `Subscribe`,
-      }) as HTMLButtonElement;
-
-      // - wait for address to be loaded.
-      await screen.findByText(getAddressLabel(billingAddress));
-
-      // - Payment button should not be disabled.
-      expect($button.disabled).toBe(false);
-
-      // - User clicks on pay button
-      await user.click($button);
-
-      // - In real world condition the success callback is immediately called for one click payments.
-      // - but here we need to click manually.
-      const $success = await screen.findByTestId('payment-success');
-      await user.click($success);
-
-      // - Route to create order should have been called
-      // - Furthermore, as payment succeeded immediately, order should have been refetched
-      const onClickApiCalls = fetchMock.calls().splice(nbApiCalls);
-      nbApiCalls += 1; // order submit
-      nbApiCalls += 1; // orders get (invalidate queries)
-      nbApiCalls += 1; // refetch order (submit invalidate)
-      nbApiCalls += 1; // fetch validated order
-      expect(fetchMock.calls()).toHaveLength(nbApiCalls);
-
-      expect(onClickApiCalls[0][0]).toBe(
-        `https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`,
-      );
-      expect(JSON.parse(onClickApiCalls[0][1]!.body as string)).toEqual({
-        billing_address: ObjectHelper.omit(billingAddress, 'id', 'is_main'),
-        credit_card_id: creditCard.id,
-      });
-      expect(onClickApiCalls[2][0]).toBe(
+        .calls()
+        .filter(
+          ([url, metadata]) =>
+            url === 'https://joanie.endpoint/api/v1.0/orders/' && metadata?.method === 'POST',
+        ),
+    ).toHaveLength(1);
+
+    // - Spinner should be displayed
+    screen.getByText('Order creation in progress');
+
+    // - Save payment step should be displayed
+    await screen.findByTestId('sale-tunnel-save-payment-method-step');
+  });
+
+  it('should render an error message when order creation fails', async () => {
+    const product = ProductFactory().one();
+    const billingAddress = AddressFactory({
+      is_main: true,
+    }).one();
+    const deferred = new Deferred();
+
+    fetchMock
+      .get(
         `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-      );
-      expect(onClickApiCalls[3][0]).toBe(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`);
-
-      // - Spinner should be displayed
-      screen.getByText('Payment in progress');
-
-      fetchMock.resetHistory();
-      nbApiCalls = 0;
-      // - Wait until order has been polled 29 times.
-      await act(async () => {
-        await jest.advanceTimersByTimeAsync(
-          (PAYMENT_SETTINGS.pollLimit - 1) * PAYMENT_SETTINGS.pollInterval,
-        );
+        [],
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
+        [],
+      )
+      .post('https://joanie.endpoint/api/v1.0/orders/', deferred.promise)
+      .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
+        overwriteRoutes: true,
       });
 
-      await waitFor(async () => {
-        expect(fetchMock.calls()).toHaveLength(PAYMENT_SETTINGS.pollLimit - 1);
-        nbApiCalls += PAYMENT_SETTINGS.pollLimit - 1;
-      });
+    render(<Wrapper product={product} />, {
+      queryOptions: { client: createTestQueryClient({ user: richieUser }) },
+    });
+    nbApiCalls += 1; // useProductOrder get order with filters
+    nbApiCalls += 1; // get user account call.
+    nbApiCalls += 1; // get user preferences call.
+    nbApiCalls += 1; // get product payment schedule.
+    await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
 
-      // - This round should be the last
-      await act(async () => {
-        jest.runOnlyPendingTimers();
-        nbApiCalls += 1; // last poll round
-      });
+    const user = userEvent.setup({ delay: null });
 
-      nbApiCalls += 1; // useProductOrder call (invalidate)
-      nbApiCalls += 1; // orders get (invalidate queries)
+    const $button = screen.getByRole('button', {
+      name: `Subscribe`,
+    }) as HTMLButtonElement;
 
-      // - The SaleTunnelNotValidated component should be rendered
-      screen.getByTestId('generic-sale-tunnel-not-validated-step');
-      screen.getByText("Sorry, you'll have to wait a little longer!");
+    // - wait for address to be loaded.
+    await screen.findByText(getAddressLabel(billingAddress));
 
-      // If productType is credential, the button should redirect to the dashboard
-      if (productType === ProductType.CREDENTIAL) {
-        const $link = screen.getByRole('link', {
-          name: 'Close',
-        });
-        expect($link.getAttribute('href')).toBe(`/en/dashboard/courses/orders/${order.id}`);
-      } else {
-        // Otherwise, the button should close the modal
-        screen.getByRole('button', {
-          name: 'Close',
-        });
-      }
+    // - As all information are provided, subscribe button should not be disabled.
+    expect($button.disabled).toBe(false);
 
-      // - And poller should be stopped
-      await act(async () => {
-        jest.runOnlyPendingTimers();
-      });
-      expect(fetchMock.calls()).toHaveLength(nbApiCalls);
-    }, 10000);
+    // - User clicks on subscribe button
+    await user.click($button);
 
-    it('should render an error message when payment failed', async () => {
-      const product = ProductFactory().one();
-      const billingAddress = AddressFactory({
-        is_main: true,
-      }).one();
-      const { payment_info: paymentInfo, ...order } = OrderWithPaymentFactory().one();
+    // - Route to create order should have been called
+    nbApiCalls += 1; // order post create (no query invalidation)
 
-      fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          [],
-        )
-        .post('https://joanie.endpoint/api/v1.0/orders/', order)
-        .patch(`https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`, {
-          payment_info: paymentInfo,
-        })
-        .get(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`, {
-          ...order,
-          state: OrderState.SUBMITTED,
-        })
-        .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
-          overwriteRoutes: true,
-        });
+    await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
 
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
-      });
-      nbApiCalls += 1; // useProductOrder get order with filters
-      nbApiCalls += 1; // get user account call.
-      nbApiCalls += 1; // get user preferences call.
-      nbApiCalls += 1; // get product payment schedule.
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
+    // - Spinner should be displayed and subscribe button should be disabled
+    screen.getByText('Order creation in progress');
+    expect($button.disabled).toBe(true);
 
-      const $terms = screen.getByLabelText(
-        'By checking this box, you accept the General Terms of Sale',
+    // - Simulate the order creation has failed
+    await act(async () => {
+      deferred.reject(
+        new HttpError(HttpStatusCode.BAD_REQUEST, 'An error occurred during order creation.'),
       );
-      const user = userEvent.setup({ delay: null });
-      await user.click($terms);
-
-      const $button = screen.getByRole('button', {
-        name: `Subscribe`,
-      }) as HTMLButtonElement;
-
-      // - wait for address to be loaded.
-      await screen.findByText(getAddressLabel(billingAddress));
-
-      // - As all information are provided, payment button should not be disabled.
-      expect($button.disabled).toBe(false);
-
-      // - User clicks on pay button
-      await user.click($button);
-
-      // - Route to create order should have been called
-      nbApiCalls += 1; // order post create (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from create)
-      nbApiCalls += 1; // order submit (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from submit)
-
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
-
-      // - Spinner should be displayed and payment button should be disabled
-      screen.getByText('Payment in progress');
-      expect($button.disabled).toBe(true);
+    });
 
-      // - Payment interface should be displayed
-      await screen.findByText('Payment interface component');
+    // - An error message should be displayed
+    const $error = screen.getByText('An error occurred during order creation. Please retry later.');
+    expect(document.activeElement).toBe($error);
 
-      // - Simulate the payment has failed
-      await act(async () => {
-        fireEvent.click(screen.getByTestId('payment-failure'));
+    // - Payment button should have been restore to its idle state
+    expect($button.disabled).toBe(false);
+    screen.getByRole('button', {
+      name: 'Subscribe',
+    });
+  });
+
+  it('should start at the save payment method step if order is in state to_save_payment_method', async () => {
+    const product = ProductFactory().one();
+    const billingAddress = AddressFactory({
+      is_main: true,
+    }).one();
+    const creditCard = CreditCardFactory().one();
+    const order = OrderFactory({ state: OrderState.TO_SAVE_PAYMENT_METHOD }).one();
+
+    fetchMock
+      .get(
+        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
+        [order],
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
+        [],
+      )
+      .get('https://joanie.endpoint/api/v1.0/credit-cards/', [creditCard], {
+        overwriteRoutes: true,
+      })
+      .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
+        overwriteRoutes: true,
       });
 
-      // - An error message should be displayed
-      const $error = screen.getByText('An error occurred during payment. Please retry later.');
-      expect(document.activeElement).toBe($error);
-      // - Payment interface should have been closed
-      expect(screen.queryByText('Payment interface component')).toBeNull();
-      // - Payment button should have been restore to its idle state
-      expect($button.disabled).toBe(false);
-      screen.getByRole('button', {
-        name: 'Subscribe',
-      });
+    render(<Wrapper product={product} />, {
+      queryOptions: { client: createTestQueryClient({ user: richieUser }) },
     });
 
-    it('should resubmit the order when user retry to pay after a payment failure', async () => {
+    nbApiCalls += 3;
+    await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
+
+    await screen.findByTestId('sale-tunnel-save-payment-method-step');
+  });
+
+  it.each([OrderState.TO_SIGN, OrderState.SIGNING])(
+    'should start at the sign step if order is in state %s',
+    async (state) => {
       const product = ProductFactory().one();
       const billingAddress = AddressFactory({
         is_main: true,
       }).one();
-      const { payment_info: paymentInfo, ...order } = OrderWithPaymentFactory().one();
+      const creditCard = CreditCardFactory().one();
+      const order = OrderFactory({ state }).one();
 
       fetchMock
         .get(
           `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [],
+          [order],
         )
         .get(
           `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
           [],
         )
-        .post('https://joanie.endpoint/api/v1.0/orders/', order)
-        .patch(`https://joanie.endpoint/api/v1.0/orders/${order.id}/submit/`, {
-          payment_info: paymentInfo,
-        })
-        .get(`https://joanie.endpoint/api/v1.0/orders/${order.id}/`, {
-          ...order,
-          state: OrderState.SUBMITTED,
+        .get('https://joanie.endpoint/api/v1.0/credit-cards/', [creditCard], {
+          overwriteRoutes: true,
         })
         .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
           overwriteRoutes: true,
@@ -705,202 +377,81 @@ describe.each([
       render(<Wrapper product={product} />, {
         queryOptions: { client: createTestQueryClient({ user: richieUser }) },
       });
-      nbApiCalls += 1; // useProductOrder get order with filters
-      nbApiCalls += 1; // get user account call.
-      nbApiCalls += 1; // get user preferences call.
-      nbApiCalls += 1; // product payment schedule call.
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
-
-      const $terms = screen.getByLabelText(
-        'By checking this box, you accept the General Terms of Sale',
-      );
-      const user = userEvent.setup({ delay: null });
-      await user.click($terms);
-
-      const $button = screen.getByRole('button', {
-        name: `Subscribe`,
-      }) as HTMLButtonElement;
-
-      // - wait for address to be loaded.
-      await screen.findByText(getAddressLabel(billingAddress));
 
-      // - User clicks on pay button
-      await user.click($button);
+      nbApiCalls += 3;
+      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
 
-      // - Update the response of order list to react to order creation.
-      fetchMock.get(
+      await screen.findByTestId('sale-tunnel-sign-step');
+    },
+  );
+
+  it('should show the product payment schedule', async () => {
+    const intl = createIntl({ locale: 'en' });
+    const product = ProductFactory().one();
+    const schedule = PaymentInstallmentFactory().many(2);
+    fetchMock
+      .get(
         `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-        [
-          {
-            ...order,
-            state: OrderState.SUBMITTED,
-          },
-        ],
-        { overwriteRoutes: true },
+        [],
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
+        schedule,
       );
 
-      // - Route to create order should have been called
-      nbApiCalls += 1; // order post create (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from create)
-      nbApiCalls += 1; // order submit (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from submit)
-
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
-
-      // - Payment interface should be displayed
-      await screen.findByText('Payment interface component');
-
-      // - Simulate the payment has failed
-      await user.click(screen.getByTestId('payment-failure'));
-
-      // - An error message should be displayed
-      const $error = screen.getByText('An error occurred during payment. Please retry later.');
-      expect(document.activeElement).toBe($error);
-
-      // - Payment button should have been restore to its idle state
-      expect($button.disabled).toBe(false);
-      screen.getByRole('button', {
-        name: `Subscribe`,
-      });
-
-      // - User clicks on pay button again
-      await user.click($button);
-
-      nbApiCalls += 1; // order submit (invalidate queries)
-      nbApiCalls += 1; // order get (invalidate queries)
-      nbApiCalls += 1; // useProductOrder call (invalidate from submit)
-      await waitFor(() => expect(fetchMock.calls()).toHaveLength(nbApiCalls));
+    render(<Wrapper product={product} />, {
+      queryOptions: { client: createTestQueryClient({ user: richieUser }) },
     });
 
-    it('should show an error if user does not accept the terms', async () => {
-      const product = ProductFactory().one();
-      const billingAddress = AddressFactory({ is_main: true }).one();
-
-      fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          [],
-        )
-        .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
-          overwriteRoutes: true,
-        });
-
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
-      });
-
-      const $button = screen.getByRole('button', {
-        name: 'Subscribe',
-      }) as HTMLButtonElement;
-
-      // - As all information are provided, payment button should not be disabled.
-      expect($button.disabled).toBe(false);
-
-      expect(screen.queryByText('You must accept the terms')).not.toBeInTheDocument();
-
-      // - User clicks on pay button
-      await act(async () => {
-        fireEvent.click($button);
-      });
-
-      expect(screen.getByText('You must accept the terms.')).toBeInTheDocument();
+    await screen.findByRole('heading', {
+      level: 4,
+      name: 'Payment schedule',
     });
 
-    it('should show a link to the platform terms and conditions', async () => {
-      const product = ProductFactory().one();
-
-      fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          [],
-        );
+    const scheduleTable = screen.getByRole('table');
+    const scheduleTableRows = within(scheduleTable).getAllByRole('row');
+    expect(scheduleTableRows).toHaveLength(schedule.length);
 
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
+    scheduleTableRows.forEach((row, index) => {
+      const installment = schedule[index];
+      // A first column should show the installment index
+      within(row).getByRole('cell', {
+        name: (index + 1).toString(),
       });
-
-      const $terms = screen.getByRole('link', { name: 'General Terms of Sale' });
-      expect($terms).toHaveAttribute('href', '/en/about/terms-and-conditions/');
-    });
-
-    it('should show the product payment schedule', async () => {
-      const intl = createIntl({ locale: 'en' });
-      const product = ProductFactory().one();
-      const schedule = PaymentInstallmentFactory().many(2);
-      fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          schedule,
-        );
-
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
+      // A 2nd column should show the installment amount
+      within(row).getByRole('cell', {
+        name: formatPrice(installment.amount, installment.currency),
       });
-
-      await screen.findByRole('heading', {
-        level: 4,
-        name: 'Payment schedule',
+      // A 3rd column should show the installment withdraw date
+      within(row).getByRole('cell', {
+        name: `Withdrawn on ${intl.formatDate(installment.due_date, {
+          ...DEFAULT_DATE_FORMAT,
+        })}`,
       });
-
-      const scheduleTable = screen.getByRole('table');
-      const scheduleTableRows = within(scheduleTable).getAllByRole('row');
-      expect(scheduleTableRows).toHaveLength(schedule.length);
-
-      scheduleTableRows.forEach((row, index) => {
-        const installment = schedule[index];
-        // A first column should show the installment index
-        within(row).getByRole('cell', {
-          name: (index + 1).toString(),
-        });
-        // A 2nd column should show the installment amount
-        within(row).getByRole('cell', {
-          name: formatPrice(installment.amount, installment.currency),
-        });
-        // A 3rd column should show the installment withdraw date
-        within(row).getByRole('cell', {
-          name: `Withdrawn on ${intl.formatDate(installment.due_date, {
-            ...DEFAULT_DATE_FORMAT,
-          })}`,
-        });
-        // A 4th column should show the installment state
-        within(row).getByRole('cell', {
-          name: StringHelper.capitalizeFirst(installment.state.replace('_', ' '))!,
-        });
+      // A 4th column should show the installment state
+      within(row).getByRole('cell', {
+        name: StringHelper.capitalizeFirst(installment.state.replace('_', ' '))!,
       });
     });
+  });
 
-    it('should show a walkthrough to explain the subscription process', async () => {
-      const product = ProductFactory().one();
-      const schedule = PaymentInstallmentFactory().many(2);
-      fetchMock
-        .get(
-          `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
-          [],
-        )
-        .get(
-          `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
-          schedule,
-        );
-
-      render(<Wrapper product={product} />, {
-        queryOptions: { client: createTestQueryClient({ user: richieUser }) },
-      });
+  it('should show a walkthrough to explain the subscription process', async () => {
+    const product = ProductFactory().one();
+    const schedule = PaymentInstallmentFactory().many(2);
+    fetchMock
+      .get(
+        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
+        [],
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
+        schedule,
+      );
 
-      screen.getByTestId('walkthrough-banner');
+    render(<Wrapper product={product} />, {
+      queryOptions: { client: createTestQueryClient({ user: richieUser }) },
     });
-  },
-);
+
+    screen.getByTestId('walkthrough-banner');
+  });
+});