fix: weird merge stuff

Author: kiram15

enterprise_access/apps/customer_billing/migrations/0018_merge_20251105_0545.py

@@ -0,0 +1,14 @@
+# Generated by Django 4.2.25 on 2025-11-05 05:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customer_billing', '0017_summary_renewal_and_future_plan_uuids'),
+        ('customer_billing', '0017_upcoming_invoice_amount_due'),
+    ]
+
+    operations = [
+    ]

enterprise_access/apps/customer_billing/tests/test_models.py

@@ -1083,7 +1083,7 @@ def _create_mock_stripe_event(self, event_type, event_data):
         mock_event.data.object = AttrDict.wrap(event_data)
         return mock_event
 
-    @mock.patch.object(stripe_api, 'stripe', autospec=True)
+    @mock.patch.object(stripe_api, 'stripe')
     def test_upcoming_invoice_amount_due(self, mock_stripe):
         """
         Test that the `upcoming_invoice_amount_due` value in the StripeEventSummary model is populated