darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-24 01:11:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix changes made with the merge conflicts.

Browse Source
This commit is contained in:
Rebecca Law
2019-09-23 13:42:45 +01:00
committed by Leo Hemsted
parent a1863fa419
commit 1d0ddeb17e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/app/celery/test_letters_pdf_tasks.py
View File

@@ -114,11 +114,12 @@ def test_get_letters_pdf_calculates_billing_units(
@freeze_time("2017-12-04 17:31:00")
def test_create_letters_pdf_calls_s3upload(mocker, sample_letter_notification):
def test_create_letters_pdf_calls_s3upload(mocker, sample_letter_template):
mocker.patch('app.celery.letters_pdf_tasks.get_letters_pdf', return_value=(b'\x00\x01', '1'))
mock_s3 = mocker.patch('app.letters.utils.s3upload')
notification = create_notification(template=sample_letter_template, reference='FOO', key_type='normal')
create_letters_pdf(sample_letter_notification.id)
create_letters_pdf(notification.id)
mock_s3.assert_called_with(
bucket_name=current_app.config['LETTERS_PDF_BUCKET_NAME'],
@@ -129,12 +130,12 @@ def test_create_letters_pdf_calls_s3upload(mocker, sample_letter_notification):
@freeze_time("2017-12-04 17:31:00")
def test_create_letters_pdf_calls_s3upload_for_test_letters(mocker, sample_letter_notification):
def test_create_letters_pdf_calls_s3upload_for_test_letters(mocker, sample_letter_template):
mocker.patch('app.celery.letters_pdf_tasks.get_letters_pdf', return_value=(b'\x00\x01', '1'))
mock_s3 = mocker.patch('app.letters.utils.s3upload')
sample_letter_notification.key_type = 'test'
notification = create_notification(template=sample_letter_template, reference='FOO', key_type='test')
create_letters_pdf(sample_letter_notification.id)
create_letters_pdf(notification.id)
mock_s3.assert_called_with(
bucket_name=current_app.config['TEST_LETTERS_BUCKET_NAME'],