used path and re_path for urls

This commit is contained in:
Asif Saif Uddin (Auvi) 2019-09-20 15:04:08 +06:00
parent c436b8ab00
commit 0817730c19
4 changed files with 31 additions and 22 deletions

View File

@ -5,7 +5,6 @@ import os.path
import tempfile import tempfile
import pytest import pytest
from django.conf.urls import url
from django.contrib.auth import authenticate, login, logout from django.contrib.auth import authenticate, login, logout
from django.contrib.auth.middleware import AuthenticationMiddleware from django.contrib.auth.middleware import AuthenticationMiddleware
from django.contrib.auth.models import User from django.contrib.auth.models import User
@ -13,6 +12,8 @@ from django.contrib.sessions.middleware import SessionMiddleware
from django.core.files.uploadedfile import SimpleUploadedFile from django.core.files.uploadedfile import SimpleUploadedFile
from django.http.request import RawPostDataException from django.http.request import RawPostDataException
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from django.conf.urls import path
from rest_framework import status from rest_framework import status
from rest_framework.authentication import SessionAuthentication from rest_framework.authentication import SessionAuthentication
@ -151,9 +152,9 @@ class FileUploadView(APIView):
urlpatterns = [ urlpatterns = [
url(r'^$', MockView.as_view()), path('', MockView.as_view()),
url(r'^echo/$', EchoView.as_view()), path('echo/', EchoView.as_view()),
url(r'^upload/$', FileUploadView.as_view()) path('upload/', FileUploadView.as_view())
] ]

View File

@ -1,11 +1,11 @@
import unittest import unittest
from django.conf.urls import url
from django.contrib.auth import authenticate, login from django.contrib.auth import authenticate, login
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.shortcuts import redirect from django.shortcuts import redirect
from django.test import override_settings from django.test import override_settings
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.urls import path
from django.views.decorators.csrf import csrf_protect, ensure_csrf_cookie from django.views.decorators.csrf import csrf_protect, ensure_csrf_cookie
from rest_framework.compat import requests from rest_framework.compat import requests
@ -90,10 +90,10 @@ class AuthView(APIView):
urlpatterns = [ urlpatterns = [
url(r'^$', Root.as_view(), name='root'), path('', Root.as_view(), name='root'),
url(r'^headers/$', HeadersView.as_view(), name='headers'), path('headers/', HeadersView.as_view(), name='headers'),
url(r'^session/$', SessionView.as_view(), name='session'), path('session/', SessionView.as_view(), name='session'),
url(r'^auth/$', AuthView.as_view(), name='auth'), path('auth/', AuthView.as_view(), name='auth'),
] ]

View File

@ -1,5 +1,5 @@
from django.conf.urls import include, url
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from django.urls import include, path, re_path
from rest_framework import generics, routers, serializers, status, viewsets from rest_framework import generics, routers, serializers, status, viewsets
from rest_framework.parsers import JSONParser from rest_framework.parsers import JSONParser
@ -117,15 +117,24 @@ new_model_viewset_router.register(r'', HTMLNewModelViewSet)
urlpatterns = [ urlpatterns = [
url(r'^setbyview$', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])), path(
url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), 'setbyview/',
url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), MockViewSettingContentType.as_view(
url(r'^html$', HTMLView.as_view()), renderer_classes=[RendererA, RendererB, RendererC])
url(r'^json$', JSONView.as_view()), ),
url(r'^html1$', HTMLView1.as_view()), re_path(
url(r'^html_new_model$', HTMLNewModelView.as_view()), r'^.*\.(?P<format>.+)$',
url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)), MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])
url(r'^restframework', include('rest_framework.urls', namespace='rest_framework')) ),
path(
'',
MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
path('html/', HTMLView.as_view()),
path('json/', JSONView.as_view()),
path('html1/', HTMLView1.as_view()),
path('html_new_model/', HTMLNewModelView.as_view()),
path('html_new_model_viewset/', include(new_model_viewset_router.urls)),
path('restframework/', include('rest_framework.urls', namespace='rest_framework'))
] ]

View File

@ -1,6 +1,5 @@
from django.conf.urls import url
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from django.urls import NoReverseMatch from django.urls import path, NoReverseMatch
from rest_framework.reverse import reverse from rest_framework.reverse import reverse
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory
@ -13,7 +12,7 @@ def null_view(request):
urlpatterns = [ urlpatterns = [
url(r'^view$', null_view, name='view'), path('view/', null_view, name='view'),
] ]