[Fixes #1555] Added test for markup errors + mini fix

akvo/rsr/tests/__init__.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+"""Akvo RSR is covered by the GNU Affero General Public License.
+
+See more details in the license.txt file located at the root folder of the Akvo RSR module.
+For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+"""

akvo/rsr/tests/pages/test_not_found.py

@@ -8,6 +8,7 @@
 
 from django.conf import settings
 from django.test import Client, TestCase
+from ..utils import contains_template_errors
 
 
 class NotFoundPageTest(TestCase):
@@ -17,8 +18,12 @@ class NotFoundPageTest(TestCase):
     def setUp(self):
         """Setup."""
         self.c = Client(HTTP_HOST=settings.RSR_DOMAIN)
+        self.resp = self.c.get('/does-not-exist')
 
     def test_not_found(self):
         """."""
-        response = self.c.get('/does-not-exist')
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(self.resp.status_code, 404)
+
+    def test_template_markup(self):
+        """Check for common template errors."""
+        self.assertFalse(contains_template_errors(self.resp.content))

akvo/rsr/tests/pages/test_organisations_dir.py

@@ -8,6 +8,7 @@
 
 from django.conf import settings
 from django.test import Client, TestCase
+from ..utils import contains_template_errors
 
 
 class PingTest(TestCase):
@@ -17,8 +18,12 @@ class PingTest(TestCase):
     def setUp(self):
         """Setup."""
         self.c = Client(HTTP_HOST=settings.RSR_DOMAIN)
+        self.resp = self.c.get('/organisations/')
 
     def test_ping(self):
         """Ping /organisations/."""
-        response = self.c.get('/organisations/')
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(self.resp.status_code, 200)
+
+    def test_template_markup(self):
+        """Check for common template errors."""
+        self.assertFalse(contains_template_errors(self.resp.content))

akvo/rsr/tests/pages/test_project_dir.py

@@ -8,6 +8,7 @@
 
 from django.conf import settings
 from django.test import Client, TestCase
+from ..utils import contains_template_errors
 
 
 class PingTest(TestCase):
@@ -17,8 +18,12 @@ class PingTest(TestCase):
     def setUp(self):
         """Setup."""
         self.c = Client(HTTP_HOST=settings.RSR_DOMAIN)
+        self.resp = self.c.get('/projects/')
 
     def test_ping(self):
         """Ping /projects/."""
-        response = self.c.get('/projects/')
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(self.resp.status_code, 200)
+
+    def test_template_markup(self):
+        """Check for common template errors."""
+        self.assertFalse(contains_template_errors(self.resp.content))

akvo/rsr/tests/pages/test_updates_dir.py

@@ -8,6 +8,7 @@
 
 from django.conf import settings
 from django.test import Client, TestCase
+from ..utils import contains_template_errors
 
 
 class PingTest(TestCase):
@@ -17,8 +18,12 @@ class PingTest(TestCase):
     def setUp(self):
         """Setup."""
         self.c = Client(HTTP_HOST=settings.RSR_DOMAIN)
+        self.resp = self.c.get('/updates/')
 
     def test_ping(self):
         """Ping /updates/."""
-        response = self.c.get('/updates/')
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(self.resp.status_code, 200)
+
+    def test_template_markup(self):
+        """Check for common template errors."""
+        self.assertFalse(contains_template_errors(self.resp.content))

akvo/rsr/tests/pages/test_widgets.py

@@ -9,6 +9,7 @@
 from django.conf import settings
 from django.test import Client, TestCase
 from akvo.rsr.models import Project, Organisation
+from ..utils import contains_template_errors
 
 
 class PingWidgetsTest(TestCase):
@@ -26,27 +27,32 @@ def test_narrow(self):
         p = Project.objects.get(title="Test Project")
         response = self.c.get('/widgets/project-narrow/{}/'.format(p.id))
         self.assertEqual(response.status_code, 200)
+        self.assertFalse(contains_template_errors(response.content))
 
     def test_cobranded_banner(self):
         """Ping /widgets/cobranded-banner."""
         p = Project.objects.get(title="Test Project")
         response = self.c.get('/widgets/cobranded-banner/{}/'.format(p.id))
         self.assertEqual(response.status_code, 200)
+        self.assertFalse(contains_template_errors(response.content))
 
     def test_project_small(self):
         """Ping /widgets/project-small."""
         p = Project.objects.get(title="Test Project")
         response = self.c.get('/widgets/project-small/{}/'.format(p.id))
         self.assertEqual(response.status_code, 200)
+        self.assertFalse(contains_template_errors(response.content))
 
     def test_project_map(self):
         """Ping /widgets/projects/map."""
         o = Organisation.objects.get(name="Partner1")
         response = self.c.get('/widgets/projects/map/?organisation_id={}'.format(o.id))
         self.assertEqual(response.status_code, 200)
+        self.assertFalse(contains_template_errors(response.content))
 
     def test_project_list(self):
         """Ping /widgets/projects/list."""
         o = Organisation.objects.get(name="Partner1")
         response = self.c.get('/widgets/projects/list/?organisation_id={}'.format(o.id))
         self.assertEqual(response.status_code, 200)
+        self.assertFalse(contains_template_errors(response.content))

akvo/rsr/tests/utils.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+"""Akvo RSR is covered by the GNU Affero General Public License.
+
+See more details in the license.txt file located at the root folder of the Akvo RSR module.
+For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
+"""
+
+
+def contains_template_errors(markup):
+    """Itterate over the markup looking for common errors."""
+    common_errors = ['{%', '%}', '{{', '}}']
+    return any(x in markup for x in common_errors)

akvo/templates/organisation_directory.html

@@ -32,7 +32,7 @@
     </div>
   </section>
   <div id="wrapper">
-    <aside  id="sidebar-wrapper" class="{ show_filters }}">
+    <aside  id="sidebar-wrapper" class="{{ show_filters }}">
       <div id="filter" class="">
         <div>
           <div class="btn-group">

akvo/templates/project_directory.html

@@ -2,7 +2,6 @@
 {% load i18n maps rsr_utils thumbnail humanize bootstrap3 compressed %}
 {% block title %}{% trans 'Projects' %}{% endblock %}
 {% block maincontent %}
-
   <section id="map" class="touch-navbar">
     {% coll_map map_projects '100%' '100%' %}
   </section>

akvo/templates/widgets/project_list.html

@@ -7,7 +7,6 @@
 {{block.super}}
 {% compressed_css 'widget_project_list' %}
 {% endblock style %}
-
 {% block body %}
 <section id="container" class="projectList {{style}} rsrWidget floats-in">
   <!-- DEVICES TABLE-->