Skip to content

Commit

Permalink
return and check for strings instead of json
Browse files Browse the repository at this point in the history
  • Loading branch information
Yeeland Chen authored and Yeeland Chen committed Apr 18, 2011
1 parent 3be2383 commit 033c05b
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions pyramid_routehelper/tests.py
Expand Up @@ -160,35 +160,35 @@ def _makeRequest(self, path, request_method = 'GET'):

def test_get_collection(self):
result = self._get('/messages')
assert result == '"index"'
assert result == 'index'

def test_get_formatted_collection(self):
result = self._get('/messages.json')
assert result == '{"format": "json"}'

def test_post_collection(self):
result = self._post('/messages')
assert result == '"create"'
assert result == 'create'

def test_get_member(self):
result = self._get('/messages/1')
assert result == '"show"'
assert result == 'show'

def test_put_member(self):
result = self._put('/messages/1')
assert result == '"update"'
assert result == 'update'

def test_delete_member(self):
result = self._delete('/messages/1')
assert result == '"delete"'
assert result == 'delete'

def test_new_member(self):
result = self._get('/messages/new')
assert result == '"new"'
assert result == 'new'

def test_edit_member(self):
result = self._get('/messages/1/edit')
assert result == '"edit"'
assert result == 'edit'

class Test_includeme(unittest.TestCase):
def test_includme(self):
Expand All @@ -200,7 +200,7 @@ class DummyCrudHandler(object):
def __init__(self, request):
self.request = request

@action(renderer='json')
@action(renderer='string')
def index(self):
return "index"

Expand All @@ -209,33 +209,33 @@ def index(self):
def api_index(self):
return {'format':'json'}

@action(renderer='json')
@action(renderer='string')
def create(self):
return "create"

@action(renderer='json', format='json')
@action(renderer='json')
@action(renderer='string')
def show(self):
return "show"

@action(renderer='json')
@action(renderer='string')
def update(self):
return "update"

@action(renderer='json')
@action(renderer='string')
def delete(self):
return "delete"

@action(renderer='json', format='json')
@action(renderer='json')
@action(renderer='string')
def new(self):
return "new"

@action(renderer='json', format='json')
@action(renderer='json')
@action(renderer='string')
def edit(self):
return "edit"

@action(renderer='json')
@action(renderer='string')
def sorted(self):
return "sorted"

0 comments on commit 033c05b

Please sign in to comment.