merge staging

tests/domain/cloud/test_models.py

@@ -134,9 +134,12 @@ def test_UserCSPPayload_mail_nickname():
     assert payload.mail_nickname == f"han.solo"
 
 
-def test_UserCSPPayload_user_principal_name():
+def test_UserCSPPayload_user_principal_name(app):
     payload = UserCSPPayload(**user_payload)
-    assert payload.user_principal_name == f"han.solo@rebelalliance.onmicrosoft.com"
+    assert (
+        payload.user_principal_name
+        == f"han.solo@rebelalliance.{app.config.get('OFFICE_365_DOMAIN')}"
+    )
 
 
 def test_UserCSPPayload_password():
@@ -167,11 +170,11 @@ class TestBillingOwnerCSPPayload:
         payload = BillingOwnerCSPPayload(**self.user_payload)
         assert payload.password
 
-    def test_user_principal_name(self):
+    def test_user_principal_name(self, app):
         payload = BillingOwnerCSPPayload(**self.user_payload)
         assert (
             payload.user_principal_name
-            == f"billing_admin@rebelalliance.onmicrosoft.com"
+            == f"billing_admin@rebelalliance.{app.config.get('OFFICE_365_DOMAIN')}"
         )
 
     def test_email(self):

tests/domain/test_portfolio_state_machine.py

@@ -216,6 +216,7 @@ def test_fsm_transition_start(mock_cloud_provider, portfolio: Portfolio):
         FSMStates.TENANT_ADMIN_OWNERSHIP_CREATED,
         FSMStates.TENANT_PRINCIPAL_OWNERSHIP_CREATED,
         FSMStates.BILLING_OWNER_CREATED,
+        FSMStates.COMPLETED,
     ]
 
     if portfolio.csp_data is not None:
@@ -239,7 +240,7 @@ def test_fsm_transition_start(mock_cloud_provider, portfolio: Portfolio):
         "first_name": ppoc.first_name,
         "last_name": ppoc.last_name,
         "country_code": "US",
-        "password_recovery_email_address": "email@example.com",  # ppoc.email,
+        "password_recovery_email_address": ppoc.email,
         "address": {  # TODO: TBD if we're sourcing this from data or config
             "company_name": "",
             "address_line_1": "",