From f097b7e77e0b8ea290ec81e9d6f2a667c2f88e24 Mon Sep 17 00:00:00 2001
From: Robert Segal <robert.segal@softwareone.com>
Date: Wed, 29 Apr 2026 08:59:47 -0600
Subject: [PATCH] fix: MPT-20694 include certificate in order factory payload

AI Generated.
Add a certificate reference to the commerce order factory so that order
creation in e2e tests no longer fails with a 400 when the upstream API
requires a certificate during agreement setup. Promote the certificate_id
fixture from tests/e2e/program/certificate/conftest.py to the shared
tests/e2e/conftest.py so the order factory can consume it outside the
program.certificate scope.
---
 tests/e2e/commerce/order/conftest.py      | 5 ++++-
 tests/e2e/conftest.py                     | 5 +++++
 tests/e2e/program/certificate/conftest.py | 5 -----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/commerce/order/conftest.py b/tests/e2e/commerce/order/conftest.py
index 2ef681d0..f10d5216 100644
--- a/tests/e2e/commerce/order/conftest.py
+++ b/tests/e2e/commerce/order/conftest.py
@@ -9,7 +9,9 @@ def invalid_order_id():
 
 @pytest.fixture
 @freeze_time("2025-12-01T10:00:00.000Z")
-def order_factory(licensee_id, commerce_product_id, commerce_item_id, authorization_id):
+def order_factory(
+    licensee_id, commerce_product_id, commerce_item_id, authorization_id, certificate_id
+):
     def factory(
         notes: str = "E2E Created Order",
         line_item_period: str = "1y",
@@ -49,6 +51,7 @@ def factory(
                     "quantity": line_quantity,
                 }
             ],
+            "certificates": [{"id": certificate_id}],
         }
 
     return factory
diff --git a/tests/e2e/conftest.py b/tests/e2e/conftest.py
index 1ce0e52a..fb515731 100644
--- a/tests/e2e/conftest.py
+++ b/tests/e2e/conftest.py
@@ -179,3 +179,8 @@ def user_group_id(e2e_config):
 @pytest.fixture(scope="session")
 def commerce_product_id(e2e_config):
     return e2e_config["commerce.product.id"]
+
+
+@pytest.fixture
+def certificate_id(e2e_config):
+    return e2e_config["program.certificate.id"]
diff --git a/tests/e2e/program/certificate/conftest.py b/tests/e2e/program/certificate/conftest.py
index b2ea6e75..664c9123 100644
--- a/tests/e2e/program/certificate/conftest.py
+++ b/tests/e2e/program/certificate/conftest.py
@@ -1,11 +1,6 @@
 import pytest
 
 
-@pytest.fixture
-def certificate_id(e2e_config):
-    return e2e_config["program.certificate.id"]
-
-
 @pytest.fixture
 def invalid_certificate_id():
     return "CER-0000-0000-0000"