Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bad f-string when downloading file #600

Merged
merged 3 commits into from
Aug 26, 2019
Merged

Fix bad f-string when downloading file #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d22eaa
Fix bad f-string.
talavis Aug 26, 2019
ac8e1d8
Fix spelling error (attachement).
talavis Aug 26, 2019
ea3bb87
Add filename check to download tests.
talavis Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backend/modules/browser/browser_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'attachment; filename={filename}')

data = utils.get_variant_list(dataset, datatype, item, ds_version)
# filter variants based on what is shown
Expand Down
7 changes: 5 additions & 2 deletions backend/modules/browser/tests/test_browser_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down