From 1d0ddeb17e3ffbda27413097a4594b87780cb2ac Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 23 Sep 2019 13:42:45 +0100 Subject: [PATCH] Fix changes made with the merge conflicts. --- tests/app/celery/test_letters_pdf_tasks.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/app/celery/test_letters_pdf_tasks.py b/tests/app/celery/test_letters_pdf_tasks.py index 2ee2ee388..441e3bffc 100644 --- a/tests/app/celery/test_letters_pdf_tasks.py +++ b/tests/app/celery/test_letters_pdf_tasks.py @@ -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'],