aboutsummaryrefslogtreecommitdiffstats
path: root/tests/models.py
AgeCommit message (Collapse)Author
2014-08-19Remove duplicated model declaration.Xavier Ordoquy
2014-08-19Merged #1398 against 2.4 branch.Xavier Ordoquy
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-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