Skip to content

Test patch calls #1760

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
merged 4 commits into from
Apr 13, 2016
Merged

Test patch calls #1760

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
df3ea00
fix call to test patch calls. Fix #1682
squirrelo Apr 8, 2016
d12b6bc
uncomment another test
squirrelo Apr 8, 2016
3dc2438
remove pass
squirrelo Apr 11, 2016
e361f5b
Merge branch 'master' of https://github.com/biocore/qiita into test-p…
squirrelo Apr 12, 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
13 changes: 6 additions & 7 deletions qiita_pet/test/test_ontology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,18 @@
# The full license is in the file LICENSE, distributed with this software.
# -----------------------------------------------------------------------------
from unittest import main
from json import loads

from qiita_pet.test.tornado_test_base import TestHandlerBase


class TestOntologyHandler(TestHandlerBase):
def test_patch(self):
# TODO: issue #1682
# arguments = {'op': 'add', 'path': 'ENA', 'value': 'new-term'}
# response = self.patch('/ontology/', data=arguments)
# self.assertEqual(response.code, 200)
# exp = {'status': 'success', 'message': ''}
# self.assertEqual(loads(response.body), exp)
pass
arguments = {'op': 'add', 'path': 'ENA', 'value': 'new-term'}
response = self.patch('/ontology/', data=arguments)
self.assertEqual(response.code, 200)
exp = {'status': 'success', 'message': ''}
self.assertEqual(loads(response.body), exp)

if __name__ == '__main__':
main()
16 changes: 7 additions & 9 deletions qiita_pet/test/test_prep_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,13 @@ def test_post_broken_header(self):
response.body)

def test_patch(self):
# TODO: issue #1682
# arguments = {'op': 'replace',
# 'path': '/1/investigation_type/',
# 'value': 'Cancer Genomics'}
# response = self.patch('/prep_template/', data=arguments)
# self.assertEqual(response.code, 200)
# exp = {'status': 'success', 'message': ''}
# self.assertEqual(laods(response.body), exp)
pass
arguments = {'op': 'replace',
'path': '/1/investigation_type/',
'value': 'Cancer Genomics'}
response = self.patch('/prep_template/', data=arguments)
self.assertEqual(response.code, 200)
exp = {'status': 'success', 'message': ''}
self.assertEqual(loads(response.body), exp)

def test_delete(self):
# Create a new prep template so we can delete it
Expand Down
22 changes: 10 additions & 12 deletions qiita_pet/test/tornado_test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def get(self, url, data=None, headers=None, doseq=True):
if isinstance(data, dict):
data = urlencode(data, doseq=doseq)
if '?' in url:
url += '&%s' % data
url += '&%s' % data
else:
url += '?%s' % data
return self._fetch(url, 'GET', headers=headers)
Expand All @@ -42,23 +42,21 @@ def post(self, url, data, headers=None, doseq=True):
data = urlencode(data, doseq=doseq)
return self._fetch(url, 'POST', data, headers)

def patch(self, url, data=None, headers=None, doseq=True):
# TODO: issue #1682
if data is not None:
if isinstance(data, dict):
data = urlencode(data, doseq=doseq)
if '?' in url:
url += '&%s' % data
else:
url += '?%s' % data
return self._fetch(url, 'PATCH', headers=headers)
def patch(self, url, data, headers=None, doseq=True):
if isinstance(data, dict):
data = urlencode(data, doseq=doseq)
if '?' in url:
url += '&%s' % data
else:
url += '?%s' % data
return self._fetch(url, 'PATCH', data=data, headers=headers)

def delete(self, url, data=None, headers=None, doseq=True):
if data is not None:
if isinstance(data, dict):
data = urlencode(data, doseq=doseq)
if '?' in url:
url += '&%s' % data
url += '&%s' % data
else:
url += '?%s' % data
return self._fetch(url, 'DELETE', headers=headers)
Expand Down