diff options
Diffstat (limited to 'rest_framework/tests/pagination.py')
| -rw-r--r-- | rest_framework/tests/pagination.py | 24 | 
1 files changed, 10 insertions, 14 deletions
diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/pagination.py index d2c9b051..e538a78e 100644 --- a/rest_framework/tests/pagination.py +++ b/rest_framework/tests/pagination.py @@ -1,18 +1,24 @@  from __future__ import unicode_literals  import datetime  from decimal import Decimal -import django +from django.db import models  from django.core.paginator import Paginator  from django.test import TestCase  from django.test.client import RequestFactory  from django.utils import unittest  from rest_framework import generics, status, pagination, filters, serializers  from rest_framework.compat import django_filters -from rest_framework.tests.models import BasicModel, FilterableItem +from rest_framework.tests.models import BasicModel  factory = RequestFactory() +class FilterableItem(models.Model): +    text = models.CharField(max_length=100) +    decimal = models.DecimalField(max_digits=4, decimal_places=2) +    date = models.DateField() + +  class RootView(generics.ListCreateAPIView):      """      Example description for OPTIONS. @@ -124,21 +130,11 @@ class IntegrationTestPaginationAndFiltering(TestCase):              model = FilterableItem              paginate_by = 10              filter_class = DecimalFilter -            filter_backend = filters.DjangoFilterBackend +            filter_backends = (filters.DjangoFilterBackend,)          view = FilterFieldsRootView.as_view()          EXPECTED_NUM_QUERIES = 2 -        if django.VERSION < (1, 4): -            # On Django 1.3 we need to use django-filter 0.5.4 -            # -            # The filter objects there don't expose a `.count()` method, -            # which means we only make a single query *but* it's a single -            # query across *all* of the queryset, instead of a COUNT and then -            # a SELECT with a LIMIT. -            # -            # Although this is fewer queries, it's actually a regression. -            EXPECTED_NUM_QUERIES = 1          request = factory.get('/?decimal=15.20')          with self.assertNumQueries(EXPECTED_NUM_QUERIES): @@ -181,7 +177,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):          class BasicFilterFieldsRootView(generics.ListCreateAPIView):              model = FilterableItem              paginate_by = 10 -            filter_backend = DecimalFilterBackend +            filter_backends = (DecimalFilterBackend,)          view = BasicFilterFieldsRootView.as_view()  | 
