pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rebase conflicts

Browse Source
This commit is contained in:
richard-dds
2019-06-10 15:33:30 -04:00
parent 5339fd34d5
commit 40b599d1d0
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/domain/test_task_orders.py
View File

@@ -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",