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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/example_fetch_from_eda.py
View File

@ -31,5 +31,5 @@ contract = client.get_contract(contract_number=contract_number, status="Y")
requested_clins = ",".join(["'0001'", "'0003'", "'1001'", "'1003'", "'2001'", "'2003'"]) requested_clins = ",".join(["'0001'", "'0003'", "'1001'", "'1003'", "'2001'", "'2003'"])
clins = client.get_clins( clins = client.get_clins(
record_key=contract_number, duns_number="", cage_code="1U305", clins=requested_clins record_key=contract_number, duns_number="", cage_code="1U305", with_clins=requested_clins
) )

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.domain.task_orders import TaskOrders
from atst.models.attachment import Attachment from atst.models.attachment import Attachment
from tests.factories import TaskOrderFactory, CLINFactory from tests.factories import TaskOrderFactory, CLINFactory, PortfolioFactory
def test_task_order_sorting(): 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): 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 = [ clins = [
{ {
"jedi_clin_type": "JEDI_CLIN_1", "jedi_clin_type": "JEDI_CLIN_1",

4
tests/factories.py
View File

@ -276,10 +276,10 @@ class TaskOrderFactory(Base):
@classmethod @classmethod
def _create(cls, model_class, *args, **kwargs): 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) 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) CLINFactory.create(task_order=task_order, number=clin)
return task_order return task_order

2
tests/routes/task_orders/test_downloads.py
View File

@ -18,7 +18,7 @@ def xml_translated(val):
def test_download_summary(client, user_session): def test_download_summary(client, user_session):
user = UserFactory.create() user = UserFactory.create()
portfolio = PortfolioFactory.create(owner=user) 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) user_session(user)
response = client.get( response = client.get(
url_for("task_orders.download_summary", task_order_id=task_order.id) url_for("task_orders.download_summary", task_order_id=task_order.id)