Fix rebase conflicts

tests/domain/test_task_orders.py

@@ -4,7 +4,7 @@ from decimal import Decimal
 
 from atst.domain.task_orders import TaskOrders
 from atst.models.attachment import Attachment
-from tests.factories import TaskOrderFactory, CLINFactory
+from tests.factories import TaskOrderFactory, CLINFactory, PortfolioFactory
 
 
 def test_task_order_sorting():
@@ -177,7 +177,7 @@ def test_update_adds_clins(pdf_upload):
 
 
 def test_update_does_not_duplicate_clins(pdf_upload):
-    task_order = TaskOrderFactory.create(number="3453453456", clins=["123", "456"])
+    task_order = TaskOrderFactory.create(number="3453453456", create_clins=["123", "456"])
     clins = [
         {
             "jedi_clin_type": "JEDI_CLIN_1",

tests/factories.py

@@ -276,10 +276,10 @@ class TaskOrderFactory(Base):
 
     @classmethod
     def _create(cls, model_class, *args, **kwargs):
-        with_clins = kwargs.pop("clins", [])
+        create_clins = kwargs.pop("create_clins", [])
         task_order = super()._create(model_class, *args, **kwargs)
 
-        for clin in with_clins:
+        for clin in create_clins:
             CLINFactory.create(task_order=task_order, number=clin)
 
         return task_order

tests/routes/task_orders/test_downloads.py

@@ -18,7 +18,7 @@ def xml_translated(val):
 def test_download_summary(client, user_session):
     user = UserFactory.create()
     portfolio = PortfolioFactory.create(owner=user)
-    task_order = TaskOrderFactory.create(creator=user, portfolio=portfolio)
+    task_order = TaskOrderFactory.create(creator=user, portfolio=portfolio, _pdf=None)
     user_session(user)
     response = client.get(
         url_for("task_orders.download_summary", task_order_id=task_order.id)