Philip Douglas
a2ae469f6b
Merge remote-tracking branch 'upstream/master'
2013-10-03 11:12:55 +01:00
Craig de Stigter
dc650f77b5
add tests for transform_fieldname methods
2013-10-03 11:34:42 +13:00
Markus Kaiserswerth
abbe9213f9
Address pending deprecation of Model._meta.module_name in Django 1.6
2013-09-23 17:48:25 +02:00
Carlton Gibson
b82c44af48
Correct typo in doc string.
2013-09-20 14:20:21 +02:00
Carlton Gibson
f07a4f4ca3
Clear cached serializer data on save()
+ test. Fixes #1116 .
2013-09-20 14:10:46 +02:00
Colin Huang
b74c5235c5
[Add]: CustomValidationTests.test_partial_update
...
This test is to make sure that validate_<attrname> is not called when
partial=True and <attrname> is not found in .data.
2013-09-15 22:22:52 -07:00
Rajiv Bose
0de1a1a0ad
Typo in strings referring to Python package, django-filter.
...
On skip of django_filters related unit-tests the reason given states the Python package 'django-filters' is not install.
However, the Python package required to run django_filters related tests is 'django-filter'.
2013-09-13 11:55:16 +01:00
Philip Douglas
e5da0ff5e5
Merge remote-tracking branch 'upstream/master'
2013-09-13 10:47:06 +01:00
Philip Douglas
6e4bdb5596
Add missing newline at the end of test file
2013-09-12 16:04:33 +01:00
Philip Douglas
59cce01b33
Fix error when serializer gets files but no data
2013-09-12 16:03:20 +01:00
Tom Christie
5970baa201
Tweaks and docs to object-level model permissions.
2013-09-10 21:00:13 +01:00
Tom Christie
75fb4b02b4
Merge branch 'master' of git://github.com/bwreilly/django-rest-framework into bwreilly-master
2013-09-10 20:21:15 +01:00
bwreilly
0183c69538
removed unnecessary guardian req and view.action parsing
2013-09-09 08:39:09 -07:00
bwreilly
118645e480
first pass at object level permissions and tests
2013-09-07 23:18:52 -05:00
Andy Freeland
b5523bcc7d
Support customizable view EXCEPTION_HANDLER
...
Add `api_settings.EXCEPTION_HANDLER` to support custom error responses.
Fixes #907 .
2013-09-06 12:47:33 -05:00
bwreilly
b07de86ad3
some properly failing tests, set up for standard permissions
2013-09-06 12:35:06 -05:00
bwreilly
4a9dcfa760
added guardian as optional requirement, stubbed out object-level permission class
2013-09-06 11:01:31 -05:00
Tom Christie
196a895fe4
Merge pull request #1076 from edmondwong/master
...
Allow OPTIONS to retrieve PUT field metadata on empty objects
2013-09-05 12:24:17 -07:00
Edmond Wong
6e7e4fc01c
Added test for OPTIONS before object creation from a PUT
2013-09-03 12:30:18 -07:00
Yuri Prezument
a15cda4be4
Regression test for #1072
2013-08-31 17:10:15 +03:00
Tom Christie
cba972911a
Fix failing empty serializer test
2013-08-30 09:12:39 +01:00
Tom Christie
3fba60e99c
Drop broken placeholder serializations.
2013-08-30 09:02:54 +01:00
Mathieu Pillard
11071499a7
Make ChoiceField.from_native() follow IntegerField behaviour on empty values
2013-08-29 18:10:47 +02:00
Tom Christie
4c53fb883f
Tweak MAX_PAGINATE_BY behavior in edge case.
...
Always respect `paginate_by` settings if client does not specify page
size. (Even if the developer has misconfigured, so that `paginate_by >
max`.)
2013-08-28 12:52:38 +01:00
Tom Christie
e1b54f2a2a
Merge branch 'max_paginate_by' of git://github.com/alexander-akhmetov/django-rest-framework into alexander-akhmetov-max_paginate_by
2013-08-27 20:58:30 +01:00
Alexander Akhmetov
316de3a8a3
Added max_paginate_by parameter
2013-08-26 20:14:17 +04:00
Tom Christie
c77e4a2c59
Merge branch 'master' into html-form-renderer
2013-08-23 16:46:14 +01:00
Tom Christie
1c935cd3d2
Fix failing test for router with no trailing slash
2013-08-23 15:18:47 +01:00
Tom Christie
b72a99fef2
Merge branch 'display-nested-data' into html-form-renderer
2013-08-23 14:39:52 +01:00
Tom Christie
110d549404
Merge pull request #1034 from KrzysiekJ/patch-create-fallback-removal
...
PATCH requests should not be able to create objects.
2013-08-23 05:34:00 -07:00
Tom Christie
95b2bf50fb
Add validation error test when passing non-file to FileField
2013-08-23 12:03:54 +01:00
Tom Christie
47d17b088a
Merge branch 'fix_937' of git://github.com/aburgel/django-rest-framework into aburgel-fix_937
2013-08-23 11:56:22 +01:00
Tom Christie
19a774f972
force_authenticate(None) also clears session info.
...
Closes #1055 .
2013-08-23 11:21:52 +01:00
Tom Christie
7cc1d38d22
Merge branch 'boolean-field-required-1004' of git://github.com/willkg/django-rest-framework
2013-08-19 21:44:52 +01:00
Christopher Paolini
5a374955b1
Updated tests for view name and description
...
Updated the tests to use the default view_name and view_description
functions in the formatter through the default in settings.
2013-08-18 00:29:05 -04:00
Will Kahn-Greene
430f00847a
Add test for BooleanField and required
...
This tests setting required=True on a BooleanField.
Test for issue #1004 .
2013-08-16 09:20:49 -04:00
Jeremy Satterfield
1d8a80f5cc
don't set X-Throttle-Wait-Second header if throttle wait is None
2013-08-13 15:31:58 -05:00
Krzysztof Jurewicz
e677f3ee5c
PATCH requests should not be able to create objects.
2013-08-13 13:26:30 +02:00
Yuri Prezument
901d2b0eb8
Failing test case for nullifying nested object
2013-08-12 21:06:37 +03:00
Yuri Prezument
abe655e061
Make OneToOneSource.target nullable
2013-08-12 21:06:37 +03:00
Alex Burgel
db9672d304
Add support for removing field files by sending an empty string
2013-07-24 17:24:29 -04:00
Pavel Zinovkin
b6d6feaa02
Fixed test
2013-07-21 22:43:19 +04:00
Tom Christie
8f79caf9d1
Use 'force_text', not 'unicode', for compat across python version
2013-07-05 09:07:18 +01:00
Tom Christie
676ab4971c
Merge branch 'remove-hold-down-control-messages' of git://github.com/rouge8/django-rest-framework into rouge8-remove-hold-down-control-messages
2013-07-05 08:55:24 +01:00
Andy Freeland
7d43f41e4a
Remove 'Hold down "Control" ...' message from help_text
...
When getting the help_text from a field where `many=True`, Django
appends 'Hold down "Control", or "Command" on a Mac, to select more than
one.' to the help_text. This makes some sense in Django's ModelForms,
but no sense in the API.
2013-07-04 01:51:24 -04:00
Tom Christie
0a722de171
Complete testing docs
2013-07-01 13:59:05 +01:00
Tom Christie
c9485c783a
Rename to force_authenticate
2013-06-29 22:53:15 +01:00
Tom Christie
664f8c6365
Added APIClient.authenticate()
2013-06-29 21:02:58 +01:00
Tom Christie
f7db06953b
Remove unneeded tests.utils, superseeded by APIRequestFactory, APIClient
2013-06-29 08:06:11 +01:00
Tom Christie
90bc07f3f1
Addeded 'APITestClient.credentials()'
2013-06-29 08:05:08 +01:00
Tom Christie
f585480ee1
Added APIClient
2013-06-28 17:50:30 +01:00
Tom Christie
7224b20d58
Added APIRequestFactory
2013-06-28 17:17:39 +01:00
Tom Christie
58d38d694e
Merge branch 'master' into writable-nested-modelserializer
2013-06-28 09:07:09 +01:00
Tom Christie
e0dddbc5de
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-06-27 12:32:46 +01:00
Tom Christie
96f41fd12d
Use imported views to expose python 2.6 bug. Refs #943
2013-06-27 11:58:34 +01:00
Tom Christie
7e67ad666b
Merge pull request #953 from j4mie/prevent-duplicate-routing
...
Prevent dynamically routing to a method that is already routed to.
2013-06-26 15:37:42 -07:00
Jamie Matthews
c127e63c32
Raise exception when attempting to dynamically route to a method that is already routed to. Fixes #940
2013-06-26 23:00:42 +01:00
Tom Christie
91b9fcb0ba
Minor test cleanup
2013-06-26 22:43:17 +01:00
Tom Christie
35e4d1cf9c
Merge pull request #943 from trwired/utf8safedocs
...
Make browsable API views play nice with utf-8
2013-06-26 14:41:07 -07:00
Igor Kalat
c8b0e6c40f
Refactored get_view_description, moved appropriate tests to test_description.py
2013-06-26 22:12:02 +02:00
Igor Kalat
2bf5f63050
Make browsable API views play nice with utf-8
2013-06-22 19:21:28 +02:00
Tom Christie
3d4bb4b553
Ensure action kwargs properly handdled. Refs #940 .
2013-06-21 22:03:07 +01:00
Tom Christie
4ad1094968
HyperlinkedModelSerializer supports overriding of 'url' field. Closes #936
2013-06-17 15:09:36 +01:00
Tom Christie
df957c8625
Fix and tests for ScopedRateThrottle. Closes #935
2013-06-14 14:18:40 +01:00
Mark Hughes
82c515c19c
Added test for custom fields with min_value and max_value validators
2013-06-12 17:36:16 +01:00
Ethan Fremen
d89aade343
Allow the default router to have a custom name.
...
Signed-off-by: Ethan Fremen <ethan@matterport.com>
2013-06-07 19:49:18 -07:00
Alex Burgel
ecb8a460c9
Fix serialization exception when using non-existent consumer
2013-06-05 17:02:44 -04:00
Tom Christie
de00ec95c3
Merge master
2013-06-05 13:33:19 +01:00
Tom Christie
2ca243a114
Fix up tests and tox
2013-06-05 13:20:06 +01:00
Tom Christie
f1251e8c58
Added trailing_slash argument to routers. Closes #905
2013-06-04 20:59:12 +01:00
Tom Christie
c160e49321
Test cases and fix for plain-list relationships (ie not queryset) Closes #878 .
2013-06-04 14:05:35 +01:00
Tom Christie
478f6ff94a
Regression test for #840 . Closes #840 .
2013-06-03 21:21:47 +01:00
Tom Christie
6e0567c271
request.user should be still be accessible in renderer context if authentication fails
2013-06-03 12:32:57 +01:00
Tom Christie
62e59f8277
Merge pull request #900 from copitux/fix-validation-layer
...
Bugfix: Fix run validation layer with invalid data
2013-06-03 00:49:02 -07:00
Tom Christie
a3796f430b
Only use test import munging prior to Django 1.6's new test runner
2013-06-02 21:04:47 +01:00
Tom Christie
27d8b848bc
Add notes on 'method' argument to '@action' decorator
2013-06-02 20:40:56 +01:00
Tom Christie
b15a6ccef2
Serializer field 'default' argument may be a callable
2013-06-02 20:12:49 +01:00
Tom Christie
372ad01b74
Test cleanup
2013-06-02 19:56:15 +01:00
Tom Christie
d7753123f6
HyperlinkedModelSerializer lookup_field option should apply to HyperlinkedIdentityField
2013-05-31 11:50:37 +01:00
Tom Christie
c36ff4e052
Cleaning up imports and whitespace
2013-05-31 11:17:33 +01:00
Tom Christie
fdf9a26740
Remove unused test helper module
2013-05-31 11:14:37 +01:00
David Medina
c176af35e5
Improve avoid validation test: #900
2013-05-30 09:07:30 +02:00
David Medina
d11b55648c
Bugfix: Fix run validation layer with invalid data
2013-05-29 12:55:42 +02:00
Tom Christie
85fe7197bf
Change test urls to match 1.6 test module name style
2013-05-29 09:00:30 +01:00
Tom Christie
cb49c5d3c0
Rename test modules to 1.6 style
2013-05-29 08:57:11 +01:00
Tom Christie
138f0cacdb
Raise 404 on incorrect lookup type in URL, not 500. Closes #890 .
2013-05-28 11:57:11 +01:00
Tom Christie
fcaee6e580
Clean up OPTIONS implementation
2013-05-24 23:44:23 +01:00
Alex Burgel
112b52f57e
Allow action decorator to handle multiple http methods
2013-05-24 18:28:47 -04:00
Tom Christie
760e8642bd
Merge branch 'issue-192-expose-fields-for-options' of https://github.com/grimborg/django-rest-framework into improved-options-support
2013-05-24 21:21:56 +01:00
Oscar Vilaplana
a1deb5eac7
simplified, moved field humanizing to Field. broken tests
2013-05-23 08:26:55 +02:00
Tom Christie
7a93fdbe0a
Last bits of charset sorting-out-ness
2013-05-22 16:46:15 +01:00
Tom Christie
17699056af
Use assertEqual, not assertEquals
2013-05-22 16:45:56 +01:00
Tom Christie
0c2b534d95
Minor cleanup
2013-05-22 09:29:43 +01:00
Tom Christie
cdc3c37465
Merge and styling fixes
2013-05-21 12:01:56 +01:00
Tom Christie
aef7ac72cc
content type may be set explicitly on the response
2013-05-20 21:18:17 +01:00
Tom Christie
f19e0d544f
Fix charset issues
2013-05-20 21:00:56 +01:00
David Jones
c3fd7c6685
Updated SlugField to raise validation errors for invalid slugs
2013-05-20 13:04:38 +01:00
Oscar Vilaplana
dea0b6ab7f
removed TODO
2013-05-19 15:48:16 +02:00
Oscar Vilaplana
259153b3f9
removed TODO
2013-05-19 15:47:50 +02:00
Oscar Vilaplana
9133ef77ab
removed TODO
2013-05-19 15:47:23 +02:00
Oscar Vilaplana
7a5cd090aa
fixed tests, added docs, renamed helper method
2013-05-19 15:45:33 +02:00
Oscar Vilaplana
6bbedfd7ae
fixed merge conflict
2013-05-19 15:18:40 +02:00
Nikolaus Schlemm
31893cff74
* make test assertion more explicit
...
* cleanup
2013-05-19 15:12:01 +02:00
Oscar Vilaplana
edbf65c06e
Removed unused imports
2013-05-19 15:06:24 +02:00
Oscar Vilaplana
696c053f4f
s/Single Character/String/
2013-05-19 15:04:43 +02:00
Oscar Vilaplana
f1f5f92d89
Added tests, cleaned up imports
2013-05-19 14:55:46 +02:00
Nikolaus Schlemm
b07cfdcf54
FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate
2013-05-19 13:54:13 +02:00
Oscar Vilaplana
08e9e2042c
Disabled label and help_text in unit test. We should change the test so
...
that it sets them up.
2013-05-19 11:26:56 +02:00
Nikolaus Schlemm
c0f3a1c397
Integrated status quo of grimborg's awesome humanize_field() for exposing field metadata via OPTIONS :)
2013-05-19 09:25:02 +02:00
Nikolaus Schlemm
9454e23aa9
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
2013-05-19 09:02:07 +02:00
Nikolaus Schlemm
843ae60237
Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options
...
Conflicts:
rest_framework/tests/fields.py
2013-05-18 18:34:21 +02:00
Nikolaus Schlemm
7f1cc82f96
added unittests for permission check of exposing actions via OPTIONS
2013-05-18 18:29:51 +02:00
Oscar Vilaplana
fecadacab1
added tests for form
2013-05-18 18:27:53 +02:00
Tom Christie
bac4bf6e95
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-18 17:22:27 +01:00
Tom Christie
0d3d66cb02
Added proper charset support
2013-05-18 17:21:43 +01:00
Oscar Vilaplana
4dffcb5d77
Added humanized field names and types
2013-05-18 18:10:17 +02:00
Tom Christie
1888f4a1f0
Merge pull request #865 from ryankask/issue-747-lazy-strings-serialized
...
Issue 747 lazy strings serialized
2013-05-18 09:05:42 -07:00
Tom Christie
6d5cf527c3
Merge pull request #864 from minddust/fix_missing_min_values
...
Fix missing min values
2013-05-18 08:56:24 -07:00
Nikolaus Schlemm
5ab7cc6e6b
HEAD and OPTIONS should not be exposed as actions as discussed in a42afa04c3 (commitcomment-3241476)
2013-05-18 17:38:47 +02:00
Markus Törnqvist
99848b0321
Drop another case of u'', this time from #530 code
2013-05-18 18:38:37 +03:00
Markus Törnqvist
1fd66fe8c6
Drop u'', it was used inconsistently and breaks for nothing with Python 3.2
2013-05-18 18:27:36 +03:00
Ryan Kaskel
33f702d306
Merge latest changes from master.
2013-05-18 16:26:17 +01:00
Nikolaus Schlemm
b225b1d5c9
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
2013-05-18 17:13:59 +02:00
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
Nikolaus Schlemm
a42afa04c3
draft for fields' metadata via OPTIONS - needs review and decision
2013-05-18 17:13:23 +02:00
Pablo Recio
b9b2297612
Tests proper encoding in JSONRenderer and UnicodeJSONRenderer
2013-05-18 17:06:54 +02:00
Stephan Groß
0c81d04170
Add min_value=0 to autogenerated Pos..IntFields
2013-05-18 17:04:20 +02:00
Karol Majta
5bebd29f11
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework
2013-05-18 16:56:38 +02:00
Karol Majta
ebe959b52a
charset param gets now appended to response's Content-Type. Closes #807
2013-05-18 16:45:05 +02:00
Markus Törnqvist
2795e842d6
Two test cases for html rendering of API with labelized model
2013-05-18 17:44:40 +03:00
Markus Törnqvist
e68ea16d7a
Update FieldLabelTest to use new BasicModel.verbose_name
2013-05-18 17:43:47 +03:00
Markus Törnqvist
e2a5ec0350
Change BasicModel.verbose_name
...
Isn't it nicer to test for a text which is different from
what the previous broken behavior was? Now we can really
tell it works!
2013-05-18 17:42:56 +03:00
Tom Christie
3f47eb7a77
Merge pull request #861 from minddust/fix_missing_field_values
...
Remove default values - django sets them for us - cause of #710
2013-05-18 07:32:50 -07:00
Stephan Groß
6714b755f4
Fix missing para..
2013-05-18 16:32:31 +02:00
Stephan Groß
aeea32030b
Add newline
2013-05-18 16:27:11 +02:00
Stephan Groß
9f9cb97d65
Add TestCases for default field values
2013-05-18 16:24:54 +02:00
Tom Christie
e1a3cab400
Merge pull request #854 from ryankask/issue-775
...
All relations pointing to ManyToManyFields should default to read-only
2013-05-18 07:22:22 -07:00
Tom Christie
cc39b9c925
Merge pull request #858 from minddust/fix_710
...
Fix for #710
2013-05-18 07:19:52 -07:00
Pablo Recio
7dca0e6859
Removed unicode literals
2013-05-18 16:12:48 +02:00
Pablo Recio
50ba26822d
Merge branch 'master' into 675-empty-label-related-field
2013-05-18 16:11:06 +02:00
Tom Christie
ea9a3d88bc
Merge pull request #859 from craigds/master
...
fix for #765
2013-05-18 07:06:21 -07:00
Markus Törnqvist
e2d3aa65d7
Move and rename LabelModelSerializer for further reuse
2013-05-18 16:56:26 +03:00
Stephan Groß
eb9fdd04fc
Remove unused var
2013-05-18 15:50:12 +02:00
Stephan Groß
e6409bbc83
Temp commit for branch change ;-)
2013-05-18 15:48:36 +02:00
Ryan Kaskel
ef383d969c
Clean up test case.
2013-05-18 14:31:29 +01:00
Craig de Stigter
208bd991da
when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765
2013-05-18 15:23:43 +02:00
Ryan Kaskel
22874e441d
Merge latest changes from master.
2013-05-18 14:17:50 +01:00
Stephan Groß
a71acc76d8
Fix for #710
2013-05-18 15:12:54 +02:00
Ryan Kaskel
0b84c5a0ac
Merge latest changes from master.
2013-05-18 14:04:27 +01:00
Pablo Recio
392c8556ae
Display an empty label into related fields if it isn't required
2013-05-18 15:01:58 +02:00