Skip to content

[LIB-548] Correct response template bug + add some test on another endpoints; #188

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
opalczynski merged 3 commits into from
Apr 26, 2016
Merged

[LIB-548] Correct response template bug + add some test on another endpoints; #188

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
c3af5ce
[LIB-548] re-work a little template on another endpoint handling in L…
opalczynski Apr 19, 2016
004c5a8
[LIB-548] correct test assert
opalczynski Apr 19, 2016
b328d1e
[LIB-548] remove type check from test;
opalczynski Apr 19, 2016
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
6 changes: 4 additions & 2 deletions syncano/models/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,6 @@ def _clone(self):
def serialize(self, data, model=None):
"""Serializes passed data to related :class:`~syncano.models.base.Model` class."""
model = model or self.model

if data == '':
return

Expand Down Expand Up @@ -777,7 +776,7 @@ def request(self, method=None, path=None, **request):
raise self.model.DoesNotExist("{} not found.".format(obj_id))
raise

if 'next' not in response:
if 'next' not in response and not self._template:
return self.serialize(response)

return response
Expand All @@ -799,6 +798,9 @@ def iterator(self):
response = self._get_response()
results = 0
while True:
if self._template:
yield response
break
objects = response.get('objects')
next_url = response.get('next')

Expand Down
14 changes: 13 additions & 1 deletion tests/integration_test_reponse_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

from syncano.models import ResponseTemplate
from syncano.models import Class, ResponseTemplate
from tests.integration_test import InstanceMixin, IntegrationTest


Expand Down Expand Up @@ -59,3 +59,15 @@ def test_rename(self):
template = template.rename(new_name=new_name)

self.assertEqual(template.name, new_name)

def test_render_on_endpoint_list(self):
template_response = Class.please.template('objects_html_table').all()

self.assertIn('<table>', template_response[0]) # all() returns a list (precise: iterator)
self.assertIn('user_profile', template_response[0])

def test_render_on_endpoint_one_elem(self):
template_response = Class.please.template('objects_html_table').get(name='user_profile')

self.assertIn('<table>', template_response)
self.assertIn('user_profile', template_response)