Merge branch 'master' of https://github.com/asciimoo/searx

Conflicts:
	searx/tests/test_engines.py

1 files changed, 0 insertions, 46 deletions

diff --git a/searx/tests/engines/test_currency_convert.py b/searx/tests/engines/test_currency_convert.py
deleted file mode 100644
index 84ec3b742..000000000
--- a/searx/tests/engines/test_currency_convert.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from collections import defaultdict
-from datetime import datetime
-import mock
-from searx.engines import currency_convert
-from searx.testing import SearxTestCase
-
-
-class TestCurrencyConvertEngine(SearxTestCase):
-
-    def test_request(self):
-        query = 'test_query'
-        dicto = defaultdict(dict)
-        dicto['pageno'] = 1
-        params = currency_convert.request(query, dicto)
-        self.assertNotIn('url', params)
-
-        query = '1.1.1 EUR in USD'
-        params = currency_convert.request(query, dicto)
-        self.assertNotIn('url', params)
-
-        query = '10 eur in usd'
-        params = currency_convert.request(query, dicto)
-        self.assertIn('url', params)
-        self.assertIn('finance.yahoo.com', params['url'])
-        self.assertIn('EUR', params['url'])
-        self.assertIn('USD', params['url'])
-
-    def test_response(self):
-        dicto = defaultdict(dict)
-        dicto['ammount'] = float(10)
-        dicto['from'] = "EUR"
-        dicto['to'] = "USD"
-        dicto['from_name'] = "euro"
-        dicto['to_name'] = "United States dollar"
-        response = mock.Mock(text='a,b,c,d', search_params=dicto)
-        self.assertEqual(currency_convert.response(response), [])
-
-        csv = "2,0.5,1"
-        response = mock.Mock(text=csv, search_params=dicto)
-        results = currency_convert.response(response)
-        self.assertEqual(type(results), list)
-        self.assertEqual(len(results), 1)
-        self.assertEqual(results[0]['answer'], '10.0 EUR = 5.0 USD, 1 EUR (euro) = 0.5 USD (United States dollar)')
-        now_date = datetime.now().strftime('%Y%m%d')
-        self.assertEqual(results[0]['url'], 'https://finance.yahoo.com/currency/converter-results/' +
-                                            now_date + '/10.0-eur-to-usd.html')