Fix rebase conflicts

2019-06-10 15:33:30 -04:00
parent 5339fd34d5
commit 40b599d1d0
4 changed files with 6 additions and 6 deletions
--- a/tests/factories.py
+++ b/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