django-rest-framework/rest_framework/tests
Markus Törnqvist 48c1b2233b Merge branch 'master' into mjtorn-master
Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py

Fixed conflicts
2013-05-18 18:13:31 +03:00
..
extras Be more informative when reporting import errors. 2013-01-07 12:52:20 +00:00
__init__.py Push tests into a seperate app namespace 'rest_framework.test' 2012-10-27 18:44:23 +01:00
authentication.py Remove client credentials from all OAuth 2 tests 2013-03-28 00:57:23 +01:00
breadcrumbs.py Cleanup imports 2013-02-04 20:55:35 +00:00
decorators.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
description.py Fix up view name/description tests 2013-04-04 21:48:23 +01:00
fields.py Fix missing para.. 2013-05-18 16:32:31 +02:00
files.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
filters.py Fix PendingDeprecation warnings in tests 2013-05-17 21:57:11 +01:00
genericrelations.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
generics.py Forms in Broseable API support dynamic serializers based on request method 2013-05-18 09:36:09 +01:00
htmlrenderer.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
hyperlinkedserializers.py HyperlinkedIdentityField uses lookup_field kwarg. 2013-05-16 11:48:35 -04:00
models.py Change BasicModel.verbose_name 2013-05-18 17:42:56 +03:00
multitable_inheritance.py Further group model inheritance tests 2013-03-11 17:32:32 -04:00
negotiation.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
pagination.py Fix PendingDeprecation warnings in tests 2013-05-17 21:57:11 +01:00
parsers.py Codebase improvements on FileUploadParser 2013-05-04 14:58:21 +06:00
permissions.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
relations_hyperlink.py add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694 2013-05-18 12:32:48 +02:00
relations_nested.py Ensure implementation of reverse relations in 'fields' is backwards compatible 2013-04-23 11:31:38 +01:00
relations_pk.py Merge latest changes from master. 2013-05-18 14:04:27 +01:00
relations_slug.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
relations.py add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694 2013-05-18 12:32:48 +02:00
renderers.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
request.py Added test for X-HTTP-Method-Override header 2013-03-12 12:00:41 +11:00
response.py Two test cases for html rendering of API with labelized model 2013-05-18 17:44:40 +03:00
reverse.py Fixed misspelled remark in comments. 2013-02-25 16:48:21 +03:00
routers.py fix test case to work with Python 3 and make it more explicit 2013-05-12 09:22:14 -04:00
serializer_bulk_update.py Bulk update, allow_add_remove flag 2013-03-25 20:26:34 +00:00
serializer_nested.py 2.2's PendingDeprecationWarnings now become DeprecationWarnings. 2.3's PendingDeprecationWarnings added. 2013-04-29 12:45:00 +01:00
serializer.py Merge branch 'master' into mjtorn-master 2013-05-18 18:13:31 +03:00
settings.py Cleanup imports 2013-02-04 20:55:35 +00:00
testcases.py Cleanup imports 2013-02-04 20:55:35 +00:00
tests.py Cleanup imports 2013-02-04 20:55:35 +00:00
throttling.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
urlpatterns.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
utils.py Added tests for PATCH form in the Browsable API 2013-02-15 15:44:11 +06:00
validation.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00
views.py assertEquals -> assertEqual 2013-02-27 21:15:00 +00:00