diff --git a/.secrets.baseline b/.secrets.baseline index 8926613d..717bf9b4 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": null, "lines": null }, - "generated_at": "2019-08-13T09:59:21Z", + "generated_at": "2019-08-14T14:39:14Z", "plugins_used": [ { "base64_limit": 4.5, @@ -169,7 +169,7 @@ "hashed_secret": "e4f14805dfd1e6af030359090c535e149e6b4207", "is_secret": false, "is_verified": false, - "line_number": 30, + "line_number": 32, "type": "Hex High Entropy String" } ], diff --git a/script/seed_sample.py b/script/seed_sample.py index 88986639..c6c164a4 100644 --- a/script/seed_sample.py +++ b/script/seed_sample.py @@ -1,7 +1,7 @@ # Add root application dir to the python path import os import sys -from datetime import timedelta, date, timedelta +from datetime import timedelta, date import random from faker import Faker from werkzeug.datastructures import FileStorage @@ -168,18 +168,19 @@ def add_task_orders_to_portfolio(portfolio): yesterday = today - timedelta(days=1) five_days = timedelta(days=5) - pdf = {"filename": "sample_task_order.pdf", "object_name": str(uuid4())} + def build_pdf(): + return {"filename": "sample_task_order.pdf", "object_name": str(uuid4())} draft_to = TaskOrderFactory.build(portfolio=portfolio, pdf=None) - unsigned_to = TaskOrderFactory.build(portfolio=portfolio, pdf=pdf) + unsigned_to = TaskOrderFactory.build(portfolio=portfolio, pdf=build_pdf()) upcoming_to = TaskOrderFactory.build( - portfolio=portfolio, signed_at=yesterday, pdf=pdf + portfolio=portfolio, signed_at=yesterday, pdf=build_pdf() ) expired_to = TaskOrderFactory.build( - portfolio=portfolio, signed_at=yesterday, pdf=pdf + portfolio=portfolio, signed_at=yesterday, pdf=build_pdf() ) active_to = TaskOrderFactory.build( - portfolio=portfolio, signed_at=yesterday, pdf=pdf + portfolio=portfolio, signed_at=yesterday, pdf=build_pdf() ) clins = [ diff --git a/tests/routes/task_orders/test_new.py b/tests/routes/task_orders/test_new.py index 29180c5c..bdc3a76d 100644 --- a/tests/routes/task_orders/test_new.py +++ b/tests/routes/task_orders/test_new.py @@ -1,6 +1,7 @@ import pytest from flask import url_for, get_flashed_messages from datetime import timedelta, date +from uuid import uuid4 from atst.domain.task_orders import TaskOrders from atst.models.task_order import Status as TaskOrderStatus @@ -10,8 +11,8 @@ from tests.factories import CLINFactory, PortfolioFactory, TaskOrderFactory, Use from tests.utils import captured_templates -def build_pdf_form_data(filename="sample.pdf", object_name="object_name"): - return {"pdf-filename": filename, "pdf-object_name": object_name} +def build_pdf_form_data(filename="sample.pdf", object_name=None): + return {"pdf-filename": filename, "pdf-object_name": object_name or uuid4()} @pytest.fixture