Skip to content

Template testing #260

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

Merged
jonc125 merged 4 commits into from
Mar 17, 2020
Merged

Template testing #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b1ee4b
Why don't tests flag this as an error?
jonc125 Mar 17, 2020
4abf49f
Now the test fails for the right reason!
jonc125 Mar 17, 2020
f6a190c
Fix the test again
jonc125 Mar 17, 2020
3384655
Fix other tests that assumed entity names
jonc125 Mar 17, 2020
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: 1 addition & 2 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ defusedxml==0.5.0 # via python3-openid, social-auth-core
dj-database-url==0.4.2
django-braces==1.11.0
django-guardian==1.4.9
django==1.11.27
first==2.0.2 # via pip-tools
django==1.11.28
flake8==3.4.1
gitdb2==2.0.5 # via gitpython
gitpython==2.1.7
Expand Down
4 changes: 2 additions & 2 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ pycodestyle==2.5.0 # via flake8
pyflakes==2.1.1 # via flake8
pyjwt==1.7.1 # via social-auth-core
pytest-cov==2.5.1
pytest-django==3.1.2
pytest==3.2.0
pytest-django==3.8.0
pytest==3.6.0
python3-openid==3.1.0 # via social-auth-core
pytz==2018.9 # via django
requests-oauthlib==1.2.0 # via social-auth-core
Expand Down
10 changes: 5 additions & 5 deletions weblab/core/recipes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
from model_mommy.recipe import Recipe, foreign_key, seq


user = Recipe('accounts.User', institution='UCL')
user = Recipe('accounts.User', institution='UCL', full_name=seq('test user '))

model = Recipe(
'ModelEntity',
entity_type='model', name=seq('mymodel')
entity_type='model', name=seq('my model')
)
protocol = Recipe(
'ProtocolEntity',
entity_type='protocol', name=seq('myprotocol')
entity_type='protocol', name=seq('my protocol')
)
fittingspec = Recipe(
'FittingSpec',
entity_type='fittingspec', name=seq('myspec'),
entity_type='fittingspec', name=seq('my spec'),
protocol=foreign_key(protocol),
)

Expand Down Expand Up @@ -46,7 +46,7 @@


dataset = Recipe('Dataset',
name=seq('mydataset'),
name=seq('my dataset'),
protocol=foreign_key(protocol))

dataset_file = Recipe('DatasetFile',
Expand Down
44 changes: 22 additions & 22 deletions weblab/entities/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,10 @@ def test_complex_visibilities(self, client, logged_in_user, other_user, helpers)
assert len(interfaces) == 4

expected = {
'myprotocol1': {'required': ['p1r2'], 'optional': ['p1o2']},
'myprotocol2': {'required': ['p2r2'], 'optional': ['p2o2']},
'myprotocol3': {'required': ['p3r1'], 'optional': ['p3o1']},
'myprotocol4': {'required': ['p4r3'], 'optional': ['p4o3']},
protocol1.name: {'required': ['p1r2'], 'optional': ['p1o2']},
protocol2.name: {'required': ['p2r2'], 'optional': ['p2o2']},
protocol3.name: {'required': ['p3r1'], 'optional': ['p3o1']},
protocol4.name: {'required': ['p4r3'], 'optional': ['p4o3']},
}
for iface in interfaces:
assert iface['name'] in expected
Expand Down Expand Up @@ -1666,7 +1666,7 @@ def test_download_archive(self, client, helpers):
archive = zipfile.ZipFile(BytesIO(response.content))
assert archive.filelist[0].filename == 'file1.txt'
assert response['Content-Disposition'] == (
'attachment; filename=%s_%s.zip' % (model.name, commit.sha)
'attachment; filename=%s_%s.zip' % (model.name.replace(' ', '_'), commit.sha)
)

def test_returns_404_if_no_commits_yet(self, logged_in_user, client):
Expand Down Expand Up @@ -2115,7 +2115,7 @@ def test_view_run_experiment_model(self, client, helpers, logged_in_user):
assert response.status_code == 200
assert response.context['object_list'] == [{'id': protocol.pk,
'entity': protocol,
'name': 'myprotocol1',
'name': protocol.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2147,14 +2147,14 @@ def test_view_run_experiment_model_multiple_users(self, client, helpers, logged_
assert response.status_code == 200
assert response.context['object_list'] == [{'id': protocol.pk,
'entity': protocol,
'name': 'myprotocol1',
'name': protocol.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
assert response.context['other_object_list'] == [
{'id': other_protocol.pk,
'entity': other_protocol,
'name': 'myprotocol2',
'name': other_protocol.name,
'versions': [{'commit': other_version2, 'tags': ['v1'], 'latest': True},
{'commit': other_version1, 'tags': [], 'latest': False}]},
]
Expand All @@ -2179,7 +2179,7 @@ def test_view_run_experiment_model_post(self, client, helpers, logged_in_user):
assert response.status_code == 200
assert response.context['object_list'] == [{'id': protocol.pk,
'entity': protocol,
'name': 'myprotocol1',
'name': protocol.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2229,7 +2229,7 @@ def test_view_run_experiment_model_post_exclude_existing(self, client, helpers,
assert response.status_code == 200
assert response.context['object_list'] == [{'id': protocol.pk,
'entity': protocol,
'name': 'myprotocol1',
'name': protocol.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2281,14 +2281,14 @@ def test_view_run_experiment_post_model_multiple_users(self, client, helpers, lo
assert response.status_code == 200
assert response.context['object_list'] == [{'id': protocol.pk,
'entity': protocol,
'name': 'myprotocol1',
'name': protocol.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
assert response.context['other_object_list'] == [
{'id': other_protocol.pk,
'entity': other_protocol,
'name': 'myprotocol2',
'name': other_protocol.name,
'versions': [{'commit': other_version2, 'tags': ['v1'], 'latest': True},
{'commit': other_version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2338,7 +2338,7 @@ def test_view_run_experiment_model_not_latest(self, client, helpers, logged_in_u
assert response.status_code == 200
assert response.context['object_list'] == [{'id': protocol.pk,
'entity': protocol,
'name': 'myprotocol1',
'name': protocol.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2384,7 +2384,7 @@ def test_view_run_experiment_protocol(self, client, helpers, logged_in_user):
assert response.status_code == 200
assert response.context['object_list'] == [{'id': model.pk,
'entity': model,
'name': 'mymodel1',
'name': model.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2416,14 +2416,14 @@ def test_view_run_experiment_protocol_multiple_users(self, client, helpers, logg
assert response.status_code == 200
assert response.context['object_list'] == [{'id': model.pk,
'entity': model,
'name': 'mymodel1',
'name': model.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
assert response.context['other_object_list'] == [
{'id': other_model.pk,
'entity': other_model,
'name': 'mymodel2',
'name': other_model.name,
'versions': [{'commit': other_version2, 'tags': ['v1'], 'latest': True},
{'commit': other_version1, 'tags': [], 'latest': False}]},
]
Expand All @@ -2446,7 +2446,7 @@ def test_view_run_experiment_protocol_post(self, client, helpers, logged_in_user
assert response.status_code == 200
assert response.context['object_list'] == [{'id': model.pk,
'entity': model,
'name': 'mymodel1',
'name': model.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2502,7 +2502,7 @@ def test_view_run_experiment_protocol_post_exclude_existing(self, client, helper
assert response.status_code == 200
assert response.context['object_list'] == [{'id': model.pk,
'entity': model,
'name': 'mymodel1',
'name': model.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2551,14 +2551,14 @@ def test_view_run_experiment_post_protocol_multiple_users(self, client, helpers,
assert response.status_code == 200
assert response.context['object_list'] == [{'id': model.pk,
'entity': model,
'name': 'mymodel1',
'name': model.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
assert response.context['other_object_list'] == [
{'id': other_model.pk,
'entity': other_model,
'name': 'mymodel2',
'name': other_model.name,
'versions': [{'commit': other_version2, 'tags': ['v1'], 'latest': True},
{'commit': other_version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2605,7 +2605,7 @@ def test_view_run_experiment_none_checked(self, client, helpers, logged_in_user)
assert response.status_code == 200
assert response.context['object_list'] == [{'id': protocol.pk,
'entity': protocol,
'name': 'myprotocol1',
'name': protocol.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down Expand Up @@ -2653,7 +2653,7 @@ def test_view_run_experiment_protocol_not_latest(self, client, helpers, logged_i
assert response.status_code == 200
assert response.context['object_list'] == [{'id': model.pk,
'entity': model,
'name': 'mymodel1',
'name': model.name,
'versions': [{'commit': version2, 'tags': ['v1'], 'latest': True},
{'commit': version1, 'tags': [], 'latest': False}]},
]
Expand Down
4 changes: 3 additions & 1 deletion weblab/experiments/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from django.core.urlresolvers import reverse
from django.test import Client
from django.utils.dateparse import parse_datetime
from pytest_django.asserts import assertContains, assertTemplateUsed

from core import recipes
from experiments.models import (
Expand Down Expand Up @@ -950,8 +951,9 @@ def test_view_experiment_version(self, client, experiment_version):
experiment_version.pk))
)

assert response.status_code == 200
assert response.context['version'] == experiment_version
assertTemplateUsed(response, 'experiments/experimentversion_detail.html')
assertContains(response, 'Download archive of all files')


@pytest.mark.django_db
Expand Down