Merge pull request arachnys#615 from hartwork/serve-root-favicon.ico

Serve /favicon.ico resembling current arachnys/img/icon_*x*.png files

bin/test_with_coverage

@@ -4,6 +4,7 @@ set -x
 output_dir='test-results'
 mkdir -p $output_dir
 
+./manage.py collectstatic --no-input
 TEMPLATE_DEBUG=True coverage run --source="./cabot/" manage.py test $@
 status=$?
 

cabot/cabotapp/tests/tests_basic.py

@@ -673,6 +673,10 @@ def test_public_page_with_public_service_with_url(self):
         expected = '<a href="http://example.com/" title="http://example.com/" target="_blank">Public service with url</a>'
         self.assertIn(expected, response.content)
 
+    def test_favicon_ico(self):
+        response = self.client.get('/favicon.ico')
+        self.assertEqual(response.status_code, 200)
+
 
 class TestAPI(LocalTestCase):
     def setUp(self):

cabot/urls.py

@@ -25,12 +25,14 @@
 
 from django.contrib import admin
 from django.views.generic.base import RedirectView
+from django.views.static import serve
 from django.shortcuts import redirect
 from django.contrib.auth.views import login, logout, password_reset, password_reset_done, password_reset_confirm
 admin.autodiscover()
 
 from importlib import import_module
 import logging
+import os
 
 logger = logging.getLogger(__name__)
 
@@ -55,6 +57,9 @@ def home_authentication_switcher(request, *args, **kwargs):
      # for the password reset views
      url('^', include('django.contrib.auth.urls')),
 
+     url(r'^(?P<path>favicon\.ico)$', serve, name='favicon',
+        kwargs={'document_root': os.path.join(settings.STATIC_ROOT, 'arachnys/img')}),
+
      url(r'^$', view=home_authentication_switcher,
         name='dashboard'),
      url(r'^subscriptions/', view=subscriptions,