Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
b6fb377c
Commit
b6fb377c
authored
May 17, 2013
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix PendingDeprecation warnings in tests
parent
14ded261
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
24 deletions
+17
-24
rest_framework/tests/filters.py
+6
-6
rest_framework/tests/generics.py
+9
-16
rest_framework/tests/pagination.py
+2
-2
No files found.
rest_framework/tests/filters.py
View file @
b6fb377c
...
...
@@ -24,7 +24,7 @@ if django_filters:
class
FilterFieldsRootView
(
generics
.
ListCreateAPIView
):
model
=
FilterableItem
filter_fields
=
[
'decimal'
,
'date'
]
filter_backend
=
filters
.
DjangoFilterBackend
filter_backend
s
=
(
filters
.
DjangoFilterBackend
,)
# These class are used to test a filter class.
class
SeveralFieldsFilter
(
django_filters
.
FilterSet
):
...
...
@@ -39,7 +39,7 @@ if django_filters:
class
FilterClassRootView
(
generics
.
ListCreateAPIView
):
model
=
FilterableItem
filter_class
=
SeveralFieldsFilter
filter_backend
=
filters
.
DjangoFilterBackend
filter_backend
s
=
(
filters
.
DjangoFilterBackend
,)
# These classes are used to test a misconfigured filter class.
class
MisconfiguredFilter
(
django_filters
.
FilterSet
):
...
...
@@ -52,12 +52,12 @@ if django_filters:
class
IncorrectlyConfiguredRootView
(
generics
.
ListCreateAPIView
):
model
=
FilterableItem
filter_class
=
MisconfiguredFilter
filter_backend
=
filters
.
DjangoFilterBackend
filter_backend
s
=
(
filters
.
DjangoFilterBackend
,)
class
FilterClassDetailView
(
generics
.
RetrieveAPIView
):
model
=
FilterableItem
filter_class
=
SeveralFieldsFilter
filter_backend
=
filters
.
DjangoFilterBackend
filter_backend
s
=
(
filters
.
DjangoFilterBackend
,)
# Regression test for #814
class
FilterableItemSerializer
(
serializers
.
ModelSerializer
):
...
...
@@ -68,12 +68,12 @@ if django_filters:
queryset
=
FilterableItem
.
objects
.
all
()
serializer_class
=
FilterableItemSerializer
filter_fields
=
[
'decimal'
,
'date'
]
filter_backend
=
filters
.
DjangoFilterBackend
filter_backend
s
=
(
filters
.
DjangoFilterBackend
,)
class
GetQuerysetView
(
generics
.
ListCreateAPIView
):
serializer_class
=
FilterableItemSerializer
filter_class
=
SeveralFieldsFilter
filter_backend
=
filters
.
DjangoFilterBackend
filter_backend
s
=
(
filters
.
DjangoFilterBackend
,)
def
get_queryset
(
self
):
return
FilterableItem
.
objects
.
all
()
...
...
rest_framework/tests/generics.py
View file @
b6fb377c
...
...
@@ -39,6 +39,7 @@ class SlugBasedInstanceView(InstanceView):
"""
model
=
SlugBasedModel
serializer_class
=
SlugSerializer
lookup_field
=
'slug'
class
TestRootView
(
TestCase
):
...
...
@@ -434,22 +435,14 @@ class TestFilterBackendAppliedToViews(TestCase):
{
'id'
:
obj
.
id
,
'text'
:
obj
.
text
}
for
obj
in
self
.
objects
.
all
()
]
self
.
root_view
=
RootView
.
as_view
()
self
.
instance_view
=
InstanceView
.
as_view
()
self
.
original_root_backend
=
getattr
(
RootView
,
'filter_backend'
)
self
.
original_instance_backend
=
getattr
(
InstanceView
,
'filter_backend'
)
def
tearDown
(
self
):
setattr
(
RootView
,
'filter_backend'
,
self
.
original_root_backend
)
setattr
(
InstanceView
,
'filter_backend'
,
self
.
original_instance_backend
)
def
test_get_root_view_filters_by_name_with_filter_backend
(
self
):
"""
GET requests to ListCreateAPIView should return filtered list.
"""
setattr
(
RootView
,
'filter_backend'
,
InclusiveFilterBackend
)
root_view
=
RootView
.
as_view
(
filter_backends
=
(
InclusiveFilterBackend
,)
)
request
=
factory
.
get
(
'/'
)
response
=
self
.
root_view
(
request
)
.
render
()
response
=
root_view
(
request
)
.
render
()
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_200_OK
)
self
.
assertEqual
(
len
(
response
.
data
),
1
)
self
.
assertEqual
(
response
.
data
,
[{
'id'
:
1
,
'text'
:
'foo'
}])
...
...
@@ -458,9 +451,9 @@ class TestFilterBackendAppliedToViews(TestCase):
"""
GET requests to ListCreateAPIView should return empty list when all models are filtered out.
"""
setattr
(
RootView
,
'filter_backend'
,
ExclusiveFilterBackend
)
root_view
=
RootView
.
as_view
(
filter_backends
=
(
ExclusiveFilterBackend
,)
)
request
=
factory
.
get
(
'/'
)
response
=
self
.
root_view
(
request
)
.
render
()
response
=
root_view
(
request
)
.
render
()
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_200_OK
)
self
.
assertEqual
(
response
.
data
,
[])
...
...
@@ -468,9 +461,9 @@ class TestFilterBackendAppliedToViews(TestCase):
"""
GET requests to RetrieveUpdateDestroyAPIView should raise 404 when model filtered out.
"""
setattr
(
InstanceView
,
'filter_backend'
,
ExclusiveFilterBackend
)
instance_view
=
InstanceView
.
as_view
(
filter_backends
=
(
ExclusiveFilterBackend
,)
)
request
=
factory
.
get
(
'/1'
)
response
=
self
.
instance_view
(
request
,
pk
=
1
)
.
render
()
response
=
instance_view
(
request
,
pk
=
1
)
.
render
()
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_404_NOT_FOUND
)
self
.
assertEqual
(
response
.
data
,
{
'detail'
:
'Not found'
})
...
...
@@ -478,8 +471,8 @@ class TestFilterBackendAppliedToViews(TestCase):
"""
GET requests to RetrieveUpdateDestroyAPIView should return a single object when not excluded
"""
setattr
(
InstanceView
,
'filter_backend'
,
InclusiveFilterBackend
)
instance_view
=
InstanceView
.
as_view
(
filter_backends
=
(
InclusiveFilterBackend
,)
)
request
=
factory
.
get
(
'/1'
)
response
=
self
.
instance_view
(
request
,
pk
=
1
)
.
render
()
response
=
instance_view
(
request
,
pk
=
1
)
.
render
()
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_200_OK
)
self
.
assertEqual
(
response
.
data
,
{
'id'
:
1
,
'text'
:
'foo'
})
rest_framework/tests/pagination.py
View file @
b6fb377c
...
...
@@ -130,7 +130,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):
model
=
FilterableItem
paginate_by
=
10
filter_class
=
DecimalFilter
filter_backend
=
filters
.
DjangoFilterBackend
filter_backend
s
=
(
filters
.
DjangoFilterBackend
,)
view
=
FilterFieldsRootView
.
as_view
()
...
...
@@ -177,7 +177,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):
class
BasicFilterFieldsRootView
(
generics
.
ListCreateAPIView
):
model
=
FilterableItem
paginate_by
=
10
filter_backend
=
DecimalFilterBackend
filter_backend
s
=
(
DecimalFilterBackend
,)
view
=
BasicFilterFieldsRootView
.
as_view
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment