Skip to content

Commit

Permalink
Merge pull request #289 from imomaliev/remove-test-module-usage
Browse files Browse the repository at this point in the history
delete rest_framework_extensions.test module usage in tests
  • Loading branch information
auvipy committed Apr 11, 2020
2 parents 4a5fd91 + 791c17e commit e7cfec9
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion tests_app/tests/functional/key_constructor/bits/tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import override_settings

from rest_framework_extensions.test import APITestCase
from rest_framework.test import APITestCase

from .models import KeyConstructorUserProperty

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.test import TestCase, override_settings

# todo: use from rest_framework when released
from rest_framework_extensions.test import APIRequestFactory
from rest_framework.test import APIRequestFactory
from .models import Comment


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import override_settings

from rest_framework_extensions.test import APITestCase
from rest_framework.test import APITestCase
from rest_framework_extensions.settings import extensions_api_settings
from rest_framework_extensions import utils

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import django
from django.test import override_settings

from rest_framework_extensions.test import APITestCase
from rest_framework.test import APITestCase
from rest_framework_extensions.settings import extensions_api_settings
from rest_framework_extensions import utils

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.test import override_settings

from rest_framework import status
from rest_framework_extensions.test import APITestCase
from rest_framework.test import APITestCase

from tests_app.testutils import basic_auth_header
from .models import PermissionsComment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.test import override_settings
from django.urls import NoReverseMatch

from rest_framework_extensions.test import APITestCase
from rest_framework.test import APITestCase


@override_settings(ROOT_URLCONF='tests_app.tests.functional.routers.extended_default_router.urls')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.test import override_settings

from rest_framework_extensions.test import APITestCase
from rest_framework.test import APITestCase

from .models import (
NestedRouterMixinUserModel as UserModel,
Expand Down
2 changes: 1 addition & 1 deletion tests_app/tests/unit/_etag/decorators/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from rest_framework_extensions.exceptions import PreconditionRequiredException

from rest_framework_extensions.etag.decorators import (etag, api_etag)
from rest_framework_extensions.test import APIRequestFactory
from rest_framework.test import APIRequestFactory
from rest_framework_extensions.utils import prepare_header_name

from tests_app.testutils import (
Expand Down
2 changes: 1 addition & 1 deletion tests_app/tests/unit/cache/decorators/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from rest_framework_extensions.cache.decorators import cache_response
from rest_framework_extensions.settings import extensions_api_settings
from rest_framework_extensions.test import APIRequestFactory
from rest_framework.test import APIRequestFactory
from tests_app.testutils import override_extensions_api_settings

factory = APIRequestFactory()
Expand Down
2 changes: 1 addition & 1 deletion tests_app/tests/unit/key_constructor/bits/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from rest_framework import views
from rest_framework.response import Response
from rest_framework_extensions.test import APIRequestFactory
from rest_framework.test import APIRequestFactory

from rest_framework_extensions.key_constructor.bits import (
KeyBitDictBase,
Expand Down
2 changes: 1 addition & 1 deletion tests_app/tests/unit/key_constructor/constructor/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
KeyConstructor,
)
from rest_framework_extensions.utils import get_unique_method_id
from rest_framework_extensions.test import APIRequestFactory
from rest_framework.test import APIRequestFactory

from tests_app.testutils import (
override_extensions_api_settings,
Expand Down
2 changes: 1 addition & 1 deletion tests_app/tests/unit/routers/nested_router_mixin/tests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from rest_framework.compat import get_regex_pattern
from rest_framework_extensions.test import APITestCase
from rest_framework.test import APITestCase
from rest_framework_extensions.routers import ExtendedSimpleRouter
from rest_framework_extensions.utils import compose_parent_pk_kwarg_name
from .views import (
Expand Down

0 comments on commit e7cfec9

Please sign in to comment.