summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2021-12-29 16:31:05 +0100
committerMarkus Heiser <markus.heiser@darmarit.de>2022-02-20 18:51:12 +0100
commitfdeece0aae9ef64c8e73773914b15fd23e2e5fce (patch)
tree28367b26911cf0465d32e9dfc8dc546611a93332 /tests
parent5ec9eb8030b0522c4dd35db41466169bc46f11d8 (diff)
[fix] changeover of the unit tests to the simple theme
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/settings/user_settings.yml4
-rw-r--r--tests/unit/test_preferences.py2
-rw-r--r--tests/unit/test_webadapter.py6
-rw-r--r--tests/unit/test_webapp.py23
4 files changed, 17 insertions, 18 deletions
diff --git a/tests/unit/settings/user_settings.yml b/tests/unit/settings/user_settings.yml
index cd5a2cde..fba8e613 100644
--- a/tests/unit/settings/user_settings.yml
+++ b/tests/unit/settings/user_settings.yml
@@ -27,10 +27,10 @@ server:
ui:
static_path: ""
templates_path: ""
- default_theme: oscar
+ default_theme: simple
default_locale: ""
theme_args:
- oscar_style: logicodev
+ simple_style: auto
engines:
- name: wikidata
diff --git a/tests/unit/test_preferences.py b/tests/unit/test_preferences.py
index a69c4517..40cfd006 100644
--- a/tests/unit/test_preferences.py
+++ b/tests/unit/test_preferences.py
@@ -119,7 +119,7 @@ class TestPreferences(SearxTestCase):
def test_encode(self):
from searx.preferences import Preferences
- pref = Preferences(['oscar'], ['general'], {}, [])
+ pref = Preferences(['oscar', 'simple'], ['general'], {}, [])
url_params = (
'eJx1VMmO2zAM_Zr6YrTocujJh6JF0QEKzKAz7VVgJNohLIseUU7ivy-VcWy5yyGOTVGP73GLKJNPYjiYgGeT4NB8BS9YOSY'
'TUdifMDYM-vmGY1d5CN0EHTYOK88W_PXNkcDBozOjnzoK0vyi4bWnHs2RU4-zvHr_-RF9a-5Cy3GARByy7X7EkKMoBeMp9CuPQ-SzYMx'
diff --git a/tests/unit/test_webadapter.py b/tests/unit/test_webadapter.py
index 975d846c..2aa5cba8 100644
--- a/tests/unit/test_webadapter.py
+++ b/tests/unit/test_webadapter.py
@@ -30,14 +30,14 @@ class ValidateQueryCase(SearxTestCase):
searx.search.initialize(TEST_ENGINES)
def test_query_private_engine_without_token(self):
- preferences = Preferences(['oscar'], ['general'], engines, [])
+ preferences = Preferences(['simple'], ['general'], engines, [])
valid, unknown, invalid_token = validate_engineref_list(SEARCHQUERY, preferences)
self.assertEqual(len(valid), 0)
self.assertEqual(len(unknown), 0)
self.assertEqual(len(invalid_token), 1)
def test_query_private_engine_with_incorrect_token(self):
- preferences_with_tokens = Preferences(['oscar'], ['general'], engines, [])
+ preferences_with_tokens = Preferences(['simple'], ['general'], engines, [])
preferences_with_tokens.parse_dict({'tokens': 'bad-token'})
valid, unknown, invalid_token = validate_engineref_list(SEARCHQUERY, preferences_with_tokens)
self.assertEqual(len(valid), 0)
@@ -45,7 +45,7 @@ class ValidateQueryCase(SearxTestCase):
self.assertEqual(len(invalid_token), 1)
def test_query_private_engine_with_correct_token(self):
- preferences_with_tokens = Preferences(['oscar'], ['general'], engines, [])
+ preferences_with_tokens = Preferences(['simple'], ['general'], engines, [])
preferences_with_tokens.parse_dict({'tokens': 'my-token'})
valid, unknown, invalid_token = validate_engineref_list(SEARCHQUERY, preferences_with_tokens)
self.assertEqual(len(valid), 1)
diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py
index 70ebd447..a50bd5c7 100644
--- a/tests/unit/test_webapp.py
+++ b/tests/unit/test_webapp.py
@@ -73,7 +73,7 @@ class ViewsTestCase(SearxTestCase):
def get_current_theme_name_mock(override=None):
if override:
return override
- return 'oscar'
+ return 'simple'
self.setattr4test(webapp, 'get_current_theme_name', get_current_theme_name_mock)
@@ -83,9 +83,7 @@ class ViewsTestCase(SearxTestCase):
result = self.app.post('/')
self.assertEqual(result.status_code, 200)
self.assertIn(
- b'<div class="text-hide center-block" id="main-logo">'
- + b'<img class="center-block img-responsive" src="/static/themes/oscar/img/searxng.svg"'
- + b' alt="searx logo" />SearXNG</div>',
+ b'<div class="title"><h1>SearXNG</h1></div>',
result.data,
)
@@ -102,7 +100,7 @@ class ViewsTestCase(SearxTestCase):
def test_search_empty_html(self):
result = self.app.post('/search', data={'q': ''})
self.assertEqual(result.status_code, 200)
- self.assertIn(b'<span class="instance pull-left"><a href="/">SearXNG</a></span>', result.data)
+ self.assertIn(b'<div class="title"><h1>SearXNG</h1></div>', result.data)
def test_search_empty_json(self):
result = self.app.post('/search', data={'q': '', 'format': 'json'})
@@ -120,13 +118,12 @@ class ViewsTestCase(SearxTestCase):
result = self.app.post('/search', data={'q': 'test'})
self.assertIn(
- b'<h4 class="result_header" id="result-2"><img width="32" height="32" class="favicon"'
- + b' src="/static/themes/oscar/img/icons/youtube.png" alt="youtube" /><a href="http://second.test.xyz"'
- + b' rel="noreferrer" aria-labelledby="result-2">Second <span class="highlight">Test</span></a></h4>', # noqa
+ b'<span class="url_o1"><span class="url_i1">http://second.test.xyz</span></span>',
result.data,
)
self.assertIn(
- b'<p class="result-content">second <span class="highlight">test</span> content</p>', result.data # noqa
+ b'<p class="content">\n second <span class="highlight">test</span> ',
+ result.data,
)
def test_index_json(self):
@@ -186,9 +183,11 @@ class ViewsTestCase(SearxTestCase):
def test_preferences(self):
result = self.app.get('/preferences')
self.assertEqual(result.status_code, 200)
- self.assertIn(b'<form method="post" action="/preferences" id="search_form" autocomplete="off">', result.data)
- self.assertIn(b'<label class="col-sm-3 col-md-2" for="categories">Default categories</label>', result.data)
- self.assertIn(b'<label class="col-sm-3 col-md-2" for="locale">Interface language</label>', result.data)
+ self.assertIn(b'<form id="search_form" method="post" action="/preferences"', result.data)
+ self.assertIn(
+ b'<input type="checkbox" id="checkbox_general" name="category_general" checked="checked"/>', result.data
+ )
+ self.assertIn(b'<legend>Interface language</legend>', result.data)
def test_browser_locale(self):
result = self.app.get('/preferences', headers={'Accept-Language': 'zh-tw;q=0.8'})