From 7d22eaa5ddc3bd67029688a7c4966472197f9f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20=C3=96stberg?= Date: Mon, 26 Aug 2019 09:08:48 +0200 Subject: [PATCH 1/3] Fix bad f-string. --- backend/modules/browser/browser_handlers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/modules/browser/browser_handlers.py b/backend/modules/browser/browser_handlers.py index aa760c766..4ab19e163 100644 --- a/backend/modules/browser/browser_handlers.py +++ b/backend/modules/browser/browser_handlers.py @@ -52,9 +52,10 @@ def get(self, dataset: str, datatype: str, item: str, # pylint: disable=too-man """ # ctrl.filterVariantsBy~ctrl.filterIncludeNonPass dataset, ds_version = utils.parse_dataset(dataset, ds_version) + filename = f'{dataset}_{datatype}_{item}.csv' self.set_header('Content-Type', 'text/csv') self.set_header(f'content-Disposition', - 'attachement; filename={f"{dataset}_{datatype}_{item}.csv"}') + f'attachement; filename={filename}') data = utils.get_variant_list(dataset, datatype, item, ds_version) # filter variants based on what is shown From ac8e1d8d670f687fed1742ded8b046c5b6b219e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20=C3=96stberg?= Date: Mon, 26 Aug 2019 09:25:33 +0200 Subject: [PATCH 2/3] Fix spelling error (attachement). --- backend/modules/browser/browser_handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/modules/browser/browser_handlers.py b/backend/modules/browser/browser_handlers.py index 4ab19e163..3a726d068 100644 --- a/backend/modules/browser/browser_handlers.py +++ b/backend/modules/browser/browser_handlers.py @@ -55,7 +55,7 @@ def get(self, dataset: str, datatype: str, item: str, # pylint: disable=too-man filename = f'{dataset}_{datatype}_{item}.csv' self.set_header('Content-Type', 'text/csv') self.set_header(f'content-Disposition', - f'attachement; filename={filename}') + f'attachment; filename={filename}') data = utils.get_variant_list(dataset, datatype, item, ds_version) # filter variants based on what is shown From ea3bb870785d58bc534e7b81eea9a86263652368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20=C3=96stberg?= Date: Mon, 26 Aug 2019 09:31:42 +0200 Subject: [PATCH 3/3] Add filename check to download tests. --- backend/modules/browser/tests/test_browser_handlers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/modules/browser/tests/test_browser_handlers.py b/backend/modules/browser/tests/test_browser_handlers.py index debcc9bbd..2657323de 100644 --- a/backend/modules/browser/tests/test_browser_handlers.py +++ b/backend/modules/browser/tests/test_browser_handlers.py @@ -33,19 +33,22 @@ def test_download(): response = requests.get('{}/api/dataset/{}/browser/download/{}/{}'.format(BASE_URL, dataset, data_type, data_item)) assert len(response.text.split('\n')) == 180 # header + 178 + \n response = requests.get('{}/api/dataset/{}/browser/download/{}/{}/filter/all~false'.format(BASE_URL, dataset, data_type, data_item)) - import logging - logging.error(response.text.split('\n')) assert len(response.text.split('\n')) == 8 response = requests.get('{}/api/dataset/{}/browser/download/{}/{}/filter/all~true'.format(BASE_URL, dataset, data_type, data_item)) assert len(response.text.split('\n')) == 180 response = requests.get('{}/api/dataset/{}/browser/download/{}/{}/filter/mislof~true'.format(BASE_URL, dataset, data_type, data_item)) assert len(response.text.split('\n')) == 2 + filename = f'{dataset}_{data_type}_{data_item}.csv' + assert response.headers['content-disposition'] == f'attachment; filename={filename}' + data_type = 'region' data_item = '22-29450622-29465622' response = requests.get('{}/api/dataset/{}/browser/download/{}/{}/filter/mislof~false'.format(BASE_URL, dataset, data_type, data_item)) assert len(response.text.split('\n')) == 3 response = requests.get('{}/api/dataset/{}/browser/download/{}/{}/filter/lof~false'.format(BASE_URL, dataset, data_type, data_item)) assert len(response.text.split('\n')) == 3 + filename = f'{dataset}_{data_type}_{data_item}.csv' + assert response.headers['content-disposition'] == f'attachment; filename={filename}' def test_get_coverage():