aboutsummaryrefslogtreecommitdiffstats
path: root/tests
AgeCommit message (Collapse)Author
2014-09-05Moved OAuth support out of DRF and into a separate package, per #1767Jharrod LaFon
2014-09-05Failing test case for #1432José Padilla
2014-09-05Delete useless assertPiotr Jakimiak
2014-09-05Use Serializer instead of ModelSerializerPiotr Jakimiak
2014-09-05Check object in testsPiotr Jakimiak
2014-09-05Fix returning None when allow_none is True in CharFieldPiotr Jakimiak
2014-09-05Merge pull request #1820 from carltongibson/login-dropdownTom Christie
Hide login link in browsable API if the login view is not registered.
2014-09-03Add custom pagination test that covers case with custom object serializer classMichał Jaworski
2014-09-02Fix importsCarlton Gibson
2014-09-02Fix docstringCarlton Gibson
2014-09-02Remove Login Dropdown when Auth Views are not registered.Carlton Gibson
Fixes #1738
2014-09-01Comform to flake8Carlton Gibson
2014-09-01Regression for #1810: Test login view rendersCarlton Gibson
2014-08-20Merge branch 'master' into set-retry-afterDmitry Mukhin
Conflicts: tests/test_throttling.py
2014-08-19Drop six from compat. 1.4.2 is now the lowest supported version.Tom Christie
2014-08-19Merge pull request #1778 from linovia/bugfix/1398Tom Christie
Bugfix/1398
2014-08-19Remove duplicated model declaration.Xavier Ordoquy
2014-08-19Resolve linting issuesTom Christie
2014-08-19Code linting and added runtests.pyTom Christie
2014-08-19Merged #1398 against 2.4 branch.Xavier Ordoquy
2014-08-19Merge masterTom Christie
2014-07-26Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: rest_framework/fields.py
2014-06-23Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini
2014-05-01Use urls functions from django instead of compat.Xavier Ordoquy
2014-05-01Merge remote-tracking branch 'reference/2.4.0' into feature/pytestXavier Ordoquy
Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini
2014-04-30Merge remote-tracking branch 'reference/master' into feature/pytestXavier Ordoquy
Conflicts: tests/test_serializer.py
2014-04-17Merge remote-tracking branch 'pelme/pytest' into feature/pytestXavier Ordoquy
Conflicts: .travis.yml rest_framework/runtests/runtests.py tests/test_filters.py tests/test_pagination.py tox.ini
2014-03-02Support for running the test suite with py.testAndreas Pelme
* Get rid of runtests.py * Moved test code from rest_framework/tests and rest_framework/runtests to tests * Invoke py.test from setup.py * Invoke py.test from Travis * Invoke py.test from tox * Changed setUpClass to be just plain setUp in test_permissions.py * Updated contribution guideline to show how to invoke py.test