From 728fc611da126ddb20cb16ccaa214a1f6d8bcdbd Mon Sep 17 00:00:00 2001
From: dalf <alex@al-f.net>
Date: Wed, 1 Oct 2014 22:46:31 +0200
Subject: [PATCH] [fix] infoboxes and answers : pass all tests

---
 searx/templates/default/result_templates/default.html |  4 +---
 searx/tests/test_webapp.py                            | 10 +++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html
index 2779462..938d66d 100644
--- a/searx/templates/default/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -8,8 +8,6 @@
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
 	{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-    <p class="content">
-      {% if result.img_src %}<img src="{{ result.img_src|safe }}" class="image" />{% endif %}
-      {% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
+    <p class="content">{% if result.img_src %}<img src="{{ result.img_src|safe }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
   </div>
 </div>
diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py
index 9d1722e..9cf5861 100644
--- a/searx/tests/test_webapp.py
+++ b/searx/tests/test_webapp.py
@@ -43,6 +43,8 @@ class ViewsTestCase(SearxTestCase):
     def test_index_html(self, search):
         search.return_value = (
             self.test_results,
+            set(),
+            set(),
             set()
         )
         result = self.app.post('/', data={'q': 'test'})
@@ -51,7 +53,7 @@ class ViewsTestCase(SearxTestCase):
             result.data
         )
         self.assertIn(
-            '<p class="content">first <span class="highlight">test</span> content<br /></p>',  # noqa
+            '<p class="content">first <span class="highlight">test</span> content<br class="last"/></p>',  # noqa
             result.data
         )
 
@@ -59,6 +61,8 @@ class ViewsTestCase(SearxTestCase):
     def test_index_json(self, search):
         search.return_value = (
             self.test_results,
+            set(),
+            set(),
             set()
         )
         result = self.app.post('/', data={'q': 'test', 'format': 'json'})
@@ -75,6 +79,8 @@ class ViewsTestCase(SearxTestCase):
     def test_index_csv(self, search):
         search.return_value = (
             self.test_results,
+            set(),
+            set(),
             set()
         )
         result = self.app.post('/', data={'q': 'test', 'format': 'csv'})
@@ -90,6 +96,8 @@ class ViewsTestCase(SearxTestCase):
     def test_index_rss(self, search):
         search.return_value = (
             self.test_results,
+            set(),
+            set(),
             set()
         )
         result = self.app.post('/', data={'q': 'test', 'format': 'rss'})