From 5568f24d6ca9ae9a7eca27c107982b2689e40105 Mon Sep 17 00:00:00 2001 From: Marc Abonce Seguin Date: Sun, 25 Nov 2018 23:32:48 -0600 Subject: [fix] check language aliases when setting search language --- tests/unit/engines/test_wikipedia.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests/unit/engines/test_wikipedia.py') diff --git a/tests/unit/engines/test_wikipedia.py b/tests/unit/engines/test_wikipedia.py index 21d0225ed..5b7408f41 100644 --- a/tests/unit/engines/test_wikipedia.py +++ b/tests/unit/engines/test_wikipedia.py @@ -8,7 +8,8 @@ from searx.testing import SearxTestCase class TestWikipediaEngine(SearxTestCase): def test_request(self): - wikipedia.supported_languages = ['fr', 'en'] + wikipedia.supported_languages = ['fr', 'en', 'no'] + wikipedia.language_aliases = {'nb': 'no'} query = 'test_query' dicto = defaultdict(dict) @@ -25,9 +26,13 @@ class TestWikipediaEngine(SearxTestCase): self.assertIn('Test_Query', params['url']) self.assertNotIn('test_query', params['url']) + dicto['language'] = 'nb' + params = wikipedia.request(query, dicto) + self.assertIn('no.wikipedia.org', params['url']) + dicto['language'] = 'xx' params = wikipedia.request(query, dicto) - self.assertIn('en', params['url']) + self.assertIn('en.wikipedia.org', params['url']) def test_response(self): dicto = defaultdict(dict) -- cgit v1.2.3 From b63d645a52d663036b97e31a59818d79faa4da81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Sun, 6 Jan 2019 15:27:46 +0100 Subject: Revert "remove 'all' option from search languages" This reverts commit 4d1770398a6af8902e75c0bd885781584d39e796. --- tests/unit/engines/test_wikipedia.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/unit/engines/test_wikipedia.py') diff --git a/tests/unit/engines/test_wikipedia.py b/tests/unit/engines/test_wikipedia.py index 5b7408f41..93b3a5ab1 100644 --- a/tests/unit/engines/test_wikipedia.py +++ b/tests/unit/engines/test_wikipedia.py @@ -26,9 +26,15 @@ class TestWikipediaEngine(SearxTestCase): self.assertIn('Test_Query', params['url']) self.assertNotIn('test_query', params['url']) +<<<<<<< HEAD dicto['language'] = 'nb' params = wikipedia.request(query, dicto) self.assertIn('no.wikipedia.org', params['url']) +======= + dicto['language'] = 'all' + params = wikipedia.request(query, dicto) + self.assertIn('en', params['url']) +>>>>>>> Revert "remove 'all' option from search languages" dicto['language'] = 'xx' params = wikipedia.request(query, dicto) -- cgit v1.2.3 From 97351a2c725ce620d452c62da07379130bafdb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Mon, 7 Jan 2019 21:28:58 +0100 Subject: fix after rebase --- tests/unit/engines/test_wikipedia.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/unit/engines/test_wikipedia.py') diff --git a/tests/unit/engines/test_wikipedia.py b/tests/unit/engines/test_wikipedia.py index 93b3a5ab1..316b12bc5 100644 --- a/tests/unit/engines/test_wikipedia.py +++ b/tests/unit/engines/test_wikipedia.py @@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase): self.assertIn('Test_Query', params['url']) self.assertNotIn('test_query', params['url']) -<<<<<<< HEAD dicto['language'] = 'nb' params = wikipedia.request(query, dicto) self.assertIn('no.wikipedia.org', params['url']) -======= dicto['language'] = 'all' params = wikipedia.request(query, dicto) self.assertIn('en', params['url']) ->>>>>>> Revert "remove 'all' option from search languages" dicto['language'] = 'xx' params = wikipedia.request(query, dicto) -- cgit v1.2.3