LOAs are so out of this codebase
This commit is contained in:
@@ -84,7 +84,6 @@ def test_create_adds_clins():
|
||||
"start_date": date(2020, 1, 1),
|
||||
"end_date": date(2021, 1, 1),
|
||||
"obligated_amount": Decimal("5000"),
|
||||
"loas": ["123123123123", "345345234"],
|
||||
},
|
||||
{
|
||||
"jedi_clin_type": "JEDI_CLIN_1",
|
||||
@@ -92,7 +91,6 @@ def test_create_adds_clins():
|
||||
"start_date": date(2020, 1, 1),
|
||||
"end_date": date(2021, 1, 1),
|
||||
"obligated_amount": Decimal("5000"),
|
||||
"loas": ["78979087"],
|
||||
},
|
||||
]
|
||||
task_order = TaskOrders.create(
|
||||
@@ -115,7 +113,6 @@ def test_update_adds_clins():
|
||||
"start_date": date(2020, 1, 1),
|
||||
"end_date": date(2021, 1, 1),
|
||||
"obligated_amount": Decimal("5000"),
|
||||
"loas": ["123123123123", "345345234"],
|
||||
},
|
||||
{
|
||||
"jedi_clin_type": "JEDI_CLIN_1",
|
||||
@@ -123,7 +120,6 @@ def test_update_adds_clins():
|
||||
"start_date": date(2020, 1, 1),
|
||||
"end_date": date(2021, 1, 1),
|
||||
"obligated_amount": Decimal("5000"),
|
||||
"loas": ["78979087"],
|
||||
},
|
||||
]
|
||||
task_order = TaskOrders.create(
|
||||
@@ -148,7 +144,6 @@ def test_update_does_not_duplicate_clins():
|
||||
"start_date": date(2020, 1, 1),
|
||||
"end_date": date(2021, 1, 1),
|
||||
"obligated_amount": Decimal("5000"),
|
||||
"loas": ["123123123123", "345345234"],
|
||||
},
|
||||
{
|
||||
"jedi_clin_type": "JEDI_CLIN_1",
|
||||
@@ -156,7 +151,6 @@ def test_update_does_not_duplicate_clins():
|
||||
"start_date": date(2020, 1, 1),
|
||||
"end_date": date(2021, 1, 1),
|
||||
"obligated_amount": Decimal("5000"),
|
||||
"loas": ["78979087"],
|
||||
},
|
||||
]
|
||||
task_order = TaskOrders.update(
|
||||
|
@@ -41,10 +41,6 @@ def random_future_date(year_min=1, year_max=5):
|
||||
return _random_date(year_min, year_max, operator.add)
|
||||
|
||||
|
||||
def random_loa_numbers():
|
||||
return ["".join(random.choices(string.digits, k=43))]
|
||||
|
||||
|
||||
def _random_date(year_min, year_max, operation):
|
||||
if year_min == year_max:
|
||||
inc = year_min
|
||||
@@ -299,7 +295,6 @@ class CLINFactory(Base):
|
||||
jedi_clin_type = factory.LazyFunction(
|
||||
lambda *args: random.choice(list(clin.JEDICLINType))
|
||||
)
|
||||
loas = factory.LazyFunction(random_loa_numbers)
|
||||
|
||||
|
||||
class NotificationRecipientFactory(Base):
|
||||
|
@@ -20,4 +20,3 @@ def test_is_obligated():
|
||||
|
||||
def test_is_completed():
|
||||
assert CLINFactory.create().is_completed
|
||||
assert not CLINFactory.create(loas=[]).is_completed
|
||||
|
@@ -194,14 +194,11 @@ def test_task_orders_submit_form_step_three_add_clins(client, user_session, task
|
||||
"clins-0-start_date": "01/01/2020",
|
||||
"clins-0-end_date": "01/01/2021",
|
||||
"clins-0-obligated_amount": "5000",
|
||||
"clins-0-loas-0": "123123123123",
|
||||
"clins-0-loas-1": "345345234",
|
||||
"clins-1-jedi_clin_type": "JEDI_CLIN_1",
|
||||
"clins-1-number": "12312",
|
||||
"clins-1-start_date": "01/01/2020",
|
||||
"clins-1-end_date": "01/01/2021",
|
||||
"clins-1-obligated_amount": "5000",
|
||||
"clins-1-loas-0": "78979087",
|
||||
}
|
||||
response = client.post(
|
||||
url_for(
|
||||
@@ -224,7 +221,6 @@ def test_task_orders_submit_form_step_three_add_clins_existing_to(
|
||||
"start_date": "01/01/2020",
|
||||
"end_date": "01/01/2021",
|
||||
"obligated_amount": "5000",
|
||||
"loas": ["123123123123", "345345234"],
|
||||
},
|
||||
{
|
||||
"jedi_clin_type": "JEDI_CLIN_1",
|
||||
@@ -232,7 +228,6 @@ def test_task_orders_submit_form_step_three_add_clins_existing_to(
|
||||
"start_date": "01/01/2020",
|
||||
"end_date": "01/01/2021",
|
||||
"obligated_amount": "5000",
|
||||
"loas": ["78979087"],
|
||||
},
|
||||
]
|
||||
TaskOrders.create_clins(task_order.id, clin_list)
|
||||
@@ -245,7 +240,6 @@ def test_task_orders_submit_form_step_three_add_clins_existing_to(
|
||||
"clins-0-start_date": "01/01/2020",
|
||||
"clins-0-end_date": "01/01/2021",
|
||||
"clins-0-obligated_amount": "5000",
|
||||
"clins-0-loas-0": "123123123123",
|
||||
}
|
||||
response = client.post(
|
||||
url_for(
|
||||
|
@@ -546,7 +546,6 @@ def test_task_orders_new_post_routes(post_url_assert_status):
|
||||
"clins-0-start_date": "01/01/2020",
|
||||
"clins-0-end_date": "01/01/2021",
|
||||
"clins-0-obligated_amount": "5000",
|
||||
"clins-0-loas-0": "123123123123",
|
||||
},
|
||||
),
|
||||
]
|
||||
|
Reference in New Issue
Block a user