31 Commits

Author	SHA1	Message	Date
Xavier Ordoquy	d08536ad9d	Merge remote-tracking branch 'origin/master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini	2014-04-13 00:05:57 +02:00
Xavier Ordoquy	7713ddc0a8	Don’t forget to setup django for 1.7+ as it’s not a regular django command.	2014-01-28 13:20:51 +01:00
Dustin Farris	52db4eadc2	Testing nested serializers with models that have str foreign key references.	2014-01-08 16:14:27 -05:00
Tom Christie	e441f85109	Drop 1.3 support	2013-09-25 10:30:04 +01:00
bwreilly	57d6b5fb7c	necessary test settings for guardian	2013-09-07 23:16:43 -05:00
bwreilly	b07de86ad3	some properly failing tests, set up for standard permissions	2013-09-06 12:35:06 -05:00
Tom Christie	715bd47dfa	Use AUTH_USER_MODEL consistently between various Django versions. Closes #946	2013-06-26 17:56:42 +01:00
Xavier Ordoquy	732269160f	Use absolute name imports for tests if django version is 1.6+.	2013-05-29 10:18:38 +02:00
Xavier Ordoquy	ed0bd195f5	Updated the dependencies version and added the ALLOWED_HOSTS for tests.	2013-05-18 12:07:44 +02:00
Tom Christie	a4b33992a5	Merge OAuth2 work.	2013-03-07 17:43:13 +00:00
Pierre Dulac	8845c0be88	Fix import errors	2013-03-06 22:42:09 +01:00
Pierre Dulac	cda21a306e	Only add the django-oauth2-provider apps if the module is installed ... otherwise log a warning	2013-03-06 19:16:13 +01:00
Pierre Dulac	4e1f77db1a	Add django-oauth2-provider to the installed apps	2013-03-01 02:07:53 +01:00
swistakm	a4304458f5	runtest.settings fixed if django-oauth-plus or oauth2 are not installed ... oauth_provider can be added to INSTALLED_APPS only if these packages are installed	2013-02-26 11:27:06 +01:00
swistakm	ced22db7cf	add django-oauth-plus & oauth2 to installed apps in runtests settings.py	2013-02-25 16:57:45 +01:00
Tom Christie	72412b69f0	Set PASSWORD_HASHERS to massively speed up tests (almost x10)	2013-02-13 12:36:05 +00:00
Tom Christie	23fbbb1e16	Drop six module from coverage.	2013-02-12 08:58:29 +00:00
Xavier Ordoquy	737349d238	Merge remote-tracking branch 'reference/py3k' into p3k	2013-01-02 16:09:21 +01:00
Tom Christie	33580c82b3	Cleanup runtests/runcoverage	2012-12-30 08:06:11 +00:00
Tom Christie	3e4242fc43	django.contrib.staticfiles no longer needs to be in INSTALLED_APPS	2012-12-28 12:33:24 +00:00
Tom Christie	eefd5b05fb	Use compat import of urlpatterns	2012-12-27 20:20:01 +00:00
Tom Christie	24ed6dcfda	Update runtest settings to include staticfiles app.	2012-12-27 17:35:00 +00:00
George Kappel	80f15c598a	Added depth test	2012-12-11 09:14:52 -06:00
Xavier Ordoquy	ab3c472974	compatible print statements.	2012-11-21 19:36:35 +01:00
Tom Christie	bc6f2a1703	Make default FILTER_BACKEND = None	2012-11-08 21:46:53 +00:00
Jacob Magnusson	44f280c3ab	Add tests for caching of GET/HEAD requests using ... Django's built in caching framework. Currently fails as some attributes on the Response object are not pickable	2012-11-04 12:47:46 +01:00
Tom Christie	8ec54e6a9f	Tweaks	2012-11-02 20:56:51 +00:00
Tom Christie	b9e576f16e	Push tests into a seperate app namespace 'rest_framework.test' ... Prevents tests from running by default when rest_framework is installed as 3rd party app. Fixes #316, #185	2012-10-27 18:44:23 +01:00
Tom Christie	c2bbe628e6	Fix coverage to not include migrations	2012-09-28 16:01:02 +01:00
Tom Christie	e003cc91b6	Get test-only models properly working	2012-09-28 14:28:50 +01:00
Tom Christie	4b691c4027	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00