~netlandish/django-wiki

d99d6436f7086bcce582f4ab1f8ca5a33aab280c — Raffaele Salmaso 6 years ago 28ddba7
Use include('django_nyt.urls') in tests
3 files changed, 3 insertions(+), 6 deletions(-)

M testproject/testproject/urls.py
M tests/core/test_urls.py
M tests/testdata/urls.py
M testproject/testproject/urls.py => testproject/testproject/urls.py +1 -2
@@ 3,7 3,6 @@ from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.http.response import HttpResponse
from django.views.static import serve as static_serve
from django_nyt.urls import get_pattern as get_notify_pattern
from wiki.compat import include, url
from wiki.urls import get_pattern as get_wiki_pattern



@@ 22,7 21,7 @@ if settings.DEBUG:


urlpatterns += [
    url(r'^notify/', get_notify_pattern()),
    url(r'^notify/', include('django_nyt.urls')),
    url(r'', get_wiki_pattern())
]


M tests/core/test_urls.py => tests/core/test_urls.py +1 -2
@@ 1,7 1,6 @@
from django.contrib.auth import get_user_model
from django.contrib.sites.models import Site
from django.test.testcases import TestCase
from django_nyt.urls import get_pattern as get_notify_pattern
from wiki.compat import include, url
from wiki.models import Article, URLPath
from wiki.urls import WikiURLPatterns, get_pattern as get_wiki_pattern


@@ 32,7 31,7 @@ class WikiCustomUrlPatterns(WikiURLPatterns):


urlpatterns = [
    url(r'^notify/', get_notify_pattern()),
    url(r'^notify/', include('django_nyt.urls')),
    url(r'', get_wiki_pattern(url_config_class=WikiCustomUrlPatterns))
]


M tests/testdata/urls.py => tests/testdata/urls.py +1 -2
@@ 1,7 1,6 @@
from django.conf import settings
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django_nyt.urls import get_pattern as get_notify_pattern
from wiki.compat import include, url
from wiki.urls import get_pattern as get_wiki_pattern



@@ 23,6 22,6 @@ if settings.DEBUG:

urlpatterns += [
    url(r'^django_functest/', include('django_functest.urls')),
    url(r'^notify/', get_notify_pattern()),
    url(r'^notify/', include('django_nyt.urls')),
    url(r'', get_wiki_pattern())
]