Skip to content

Commit

Permalink
Change template_used to templates_used
Browse files Browse the repository at this point in the history
  • Loading branch information
slomo committed Sep 21, 2016
1 parent f40dbc8 commit a305c85
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 14 deletions.
4 changes: 2 additions & 2 deletions tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ def createThumbnail(imagefield):
return thumbnail_path


def template_used(response, template_name):
def templates_used(response):
if not hasattr(response, 'templates'):
raise Exception("Response wasn't render from template")
names = [template.name for template in response.templates]
return template_name in names
return names


def redirect_target(response):
Expand Down
18 changes: 11 additions & 7 deletions tests/memberships/test_memberships_views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
from django.core import mail
from django.core.urlresolvers import reverse
from tests.helpers import redirect_target, template_used
from tests.helpers import redirect_target, templates_used

from euth.memberships import models

Expand All @@ -16,9 +16,11 @@ def test_create_request(client, project, user):
client.login(username=user.email, password='password')
response = client.get(url)
assert response.status_code == 200
assert template_used(response,
'euth_projects/includes/project_hero_unit.html')
assert template_used(response, 'euth_memberships/request_detail.html')
assert (
'euth_projects/includes/project_hero_unit.html'
in templates_used(response)
)
assert 'euth_memberships/request_detail.html' in templates_used(response)

response = client.post(url, data={})
assert redirect_target(response) == 'memberships-request'
Expand All @@ -40,9 +42,11 @@ def test_accept_invite(client, invite, user):
client.login(username=user.email, password='password')
response = client.get(url)
assert response.status_code == 200
assert template_used(response,
'euth_projects/includes/project_hero_unit.html')
assert template_used(response, 'euth_memberships/invite_form.html')
assert (
'euth_projects/includes/project_hero_unit.html'
in templates_used(response)
)
assert 'euth_memberships/invite_form.html' in templates_used(response)

response = client.post(url, data={'accept': ''})
assert redirect_target(response) == 'project-detail'
Expand Down
14 changes: 9 additions & 5 deletions tests/projects/test_project_views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
from django.core.urlresolvers import reverse
from tests.helpers import redirect_target, template_used
from tests.helpers import redirect_target, templates_used


@pytest.mark.django_db
Expand Down Expand Up @@ -41,14 +41,18 @@ def test_detail_draft_project(client, project, user):
client.login(username=user.email, password='password')
response = client.get(project_url)
assert response.status_code == 403
assert not template_used(response,
'euth_projects/project_membership_request.html')
assert (
'euth_projects/project_membership_request.html'
not in templates_used(response)
)

project.participants.add(user)
response = client.get(project_url)
assert response.status_code == 403
assert not template_used(response,
'euth_projects/project_membership_request.html')
assert (
'euth_projects/project_membership_request.html'
not in templates_used(response)
)

project.organisation.initiators.add(user)
response = client.get(project_url)
Expand Down

0 comments on commit a305c85

Please sign in to comment.