Fixed #15552 -- LOGIN_URL and LOGIN_REDIRECT_URL can take URLpattern names.

Thanks UloPe and Eric Florenzano for the patch, and Malcolm Tredinnick for
review.

tests/regressiontests/comment_tests/tests/__init__.py

@@ -17,7 +17,7 @@ CT = ContentType.objects.get_for_model
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',))
 class CommentTestCase(TestCase):
     fixtures = ["comment_tests"]
-    urls = 'django.contrib.comments.urls'
+    urls = 'regressiontests.comment_tests.urls_default'
 
     def createSomeComments(self):
         # Two anonymous comments on two different objects

tests/regressiontests/comment_tests/urls_default.py

@@ -0,0 +1,9 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('',
+    (r'^', include('django.contrib.comments.urls')),
+
+    # Provide the auth system login and logout views
+    (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
+    (r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
+)

tests/regressiontests/resolve_url/models.py

@@ -0,0 +1,12 @@
+"""
+Regression tests for the resolve_url function.
+"""
+
+from django.db import models
+
+
+class UnimportantThing(models.Model):
+    importance = models.IntegerField()
+
+    def get_absolute_url(self):
+        return '/importance/%d/' % (self.importance,)

tests/regressiontests/resolve_url/tests.py

@@ -0,0 +1,68 @@
+from __future__ import unicode_literals
+
+from django.core.urlresolvers import NoReverseMatch
+from django.contrib.auth.views import logout
+from django.utils.unittest import TestCase
+from django.shortcuts import resolve_url
+
+from .models import UnimportantThing
+
+
+class ResolveUrlTests(TestCase):
+    """
+    Tests for the ``resolve_url`` function.
+    """
+
+    def test_url_path(self):
+        """
+        Tests that passing a URL path to ``resolve_url`` will result in the
+        same url.
+        """
+        self.assertEqual('/something/', resolve_url('/something/'))
+
+    def test_full_url(self):
+        """
+        Tests that passing a full URL to ``resolve_url`` will result in the
+        same url.
+        """
+        url = 'http://example.com/'
+        self.assertEqual(url, resolve_url(url))
+
+    def test_model(self):
+        """
+        Tests that passing a model to ``resolve_url`` will result in
+        ``get_absolute_url`` being called on that model instance.
+        """
+        m = UnimportantThing(importance=1)
+        self.assertEqual(m.get_absolute_url(), resolve_url(m))
+
+    def test_view_function(self):
+        """
+        Tests that passing a view name to ``resolve_url`` will result in the
+        URL path mapping to that view name.
+        """
+        resolved_url = resolve_url(logout)
+        self.assertEqual('/accounts/logout/', resolved_url)
+
+    def test_valid_view_name(self):
+        """
+        Tests that passing a view function to ``resolve_url`` will result in
+        the URL path mapping to that view.
+        """
+        resolved_url = resolve_url('django.contrib.auth.views.logout')
+        self.assertEqual('/accounts/logout/', resolved_url)
+
+    def test_domain(self):
+        """
+        Tests that passing a domain to ``resolve_url`` returns the same domain.
+        """
+        self.assertEqual(resolve_url('example.com'), 'example.com')
+
+    def test_non_view_callable_raises_no_reverse_match(self):
+        """
+        Tests that passing a non-view callable into ``resolve_url`` raises a
+        ``NoReverseMatch`` exception.
+        """
+        with self.assertRaises(NoReverseMatch):
+            resolve_url(lambda: 'asdf')
+

tests/runtests.py

@@ -92,7 +92,7 @@ def setup(verbosity, test_labels):
     settings.TEMPLATE_DIRS = (os.path.join(RUNTESTS_DIR, TEST_TEMPLATE_DIR),)
     settings.USE_I18N = True
     settings.LANGUAGE_CODE = 'en'
-    settings.LOGIN_URL = '/accounts/login/'
+    settings.LOGIN_URL = 'django.contrib.auth.views.login'
     settings.MIDDLEWARE_CLASSES = (
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',