6c75052 · searx · git.iko.soy

git.iko.soy/searx

Merge branch 'master' into ne/improve-infinite-scroll

commit6c750528749afcfd878347df78ccd45aaf8afcd6 authorNoémi Ványi <kvch@users.noreply.github.com> dateSun 30 Jun 2019, 13:45 (7 years ago) parent06979fa 4c768f9

3 files changed+10−2

compare with master

unifiedsplit

searx/__init__.py+2 searx/webapp.py+2−2 tests/unit/test_webapp.py+6

searx/__init__.py+2

@@ -91,3 +91,5 @@ logger.info('Initialisation done')

9191

9292if 'SEARX_SECRET' in environ:

9393 settings['server']['secret_key'] = environ['SEARX_SECRET']

94+if 'SEARX_BIND_ADDRESS' in environ:

95+ settings['server']['bind_address'] = environ['SEARX_BIND_ADDRESS']

searx/webapp.py+2−2

@@ -846,7 +846,7 @@ def clear_cookies():

846846

847847@app.route('/config')

848848def config():

849− return jsonify({'categories': categories.keys(),

849+ return jsonify({'categories': list(categories.keys()),

850850 'engines': [{'name': engine_name,

851851 'categories': engine.categories,

852852 'shortcut': engine.shortcut,

@@ -854,7 +854,7 @@ def config():

854854 'paging': engine.paging,

855855 'language_support': engine.language_support,

856856 'supported_languages':

857− engine.supported_languages.keys()

857+ list(engine.supported_languages.keys())

858858 if isinstance(engine.supported_languages, dict)

859859 else engine.supported_languages,

860860 'safesearch': engine.safesearch,

tests/unit/test_webapp.py+6

@@ -157,3 +157,9 @@ class ViewsTestCase(SearxTestCase):

157157 def test_favicon(self):

158158 result = self.app.get('/favicon.ico')

159159 self.assertEqual(result.status_code, 200)

160+

161+ def test_config(self):

162+ result = self.app.get('/config')

163+ self.assertEqual(result.status_code, 200)

164+ json_result = result.get_json()

165+ self.assertTrue(json_result)