|
@@ -6,8 +6,8 @@ from mock import Mock
|
6
|
6
|
|
7
|
7
|
|
8
|
8
|
def get_search_mock(query, **kwargs):
|
9
|
|
- return {'search': Mock(query=query, **kwargs),
|
10
|
|
- 'result_container': Mock(answers=set())}
|
|
9
|
+ return Mock(search_query=Mock(query=query, **kwargs),
|
|
10
|
+ result_container=Mock(answers=set()))
|
11
|
11
|
|
12
|
12
|
|
13
|
13
|
class PluginStoreTest(SearxTestCase):
|
|
@@ -51,39 +51,39 @@ class SelfIPTest(SearxTestCase):
|
51
|
51
|
request = Mock(user_plugins=store.plugins,
|
52
|
52
|
remote_addr='127.0.0.1')
|
53
|
53
|
request.headers.getlist.return_value = []
|
54
|
|
- ctx = get_search_mock(query='ip', pageno=1)
|
55
|
|
- store.call('post_search', request, ctx)
|
56
|
|
- self.assertTrue('127.0.0.1' in ctx['result_container'].answers)
|
|
54
|
+ search = get_search_mock(query='ip', pageno=1)
|
|
55
|
+ store.call('post_search', request, search)
|
|
56
|
+ self.assertTrue('127.0.0.1' in search.result_container.answers)
|
57
|
57
|
|
58
|
|
- ctx = get_search_mock(query='ip', pageno=2)
|
59
|
|
- store.call('post_search', request, ctx)
|
60
|
|
- self.assertFalse('127.0.0.1' in ctx['result_container'].answers)
|
|
58
|
+ search = get_search_mock(query='ip', pageno=2)
|
|
59
|
+ store.call('post_search', request, search)
|
|
60
|
+ self.assertFalse('127.0.0.1' in search.result_container.answers)
|
61
|
61
|
|
62
|
62
|
# User agent test
|
63
|
63
|
request = Mock(user_plugins=store.plugins,
|
64
|
64
|
user_agent='Mock')
|
65
|
65
|
request.headers.getlist.return_value = []
|
66
|
66
|
|
67
|
|
- ctx = get_search_mock(query='user-agent', pageno=1)
|
68
|
|
- store.call('post_search', request, ctx)
|
69
|
|
- self.assertTrue('Mock' in ctx['result_container'].answers)
|
|
67
|
+ search = get_search_mock(query='user-agent', pageno=1)
|
|
68
|
+ store.call('post_search', request, search)
|
|
69
|
+ self.assertTrue('Mock' in search.result_container.answers)
|
70
|
70
|
|
71
|
|
- ctx = get_search_mock(query='user-agent', pageno=2)
|
72
|
|
- store.call('post_search', request, ctx)
|
73
|
|
- self.assertFalse('Mock' in ctx['result_container'].answers)
|
|
71
|
+ search = get_search_mock(query='user-agent', pageno=2)
|
|
72
|
+ store.call('post_search', request, search)
|
|
73
|
+ self.assertFalse('Mock' in search.result_container.answers)
|
74
|
74
|
|
75
|
|
- ctx = get_search_mock(query='user-agent', pageno=1)
|
76
|
|
- store.call('post_search', request, ctx)
|
77
|
|
- self.assertTrue('Mock' in ctx['result_container'].answers)
|
|
75
|
+ search = get_search_mock(query='user-agent', pageno=1)
|
|
76
|
+ store.call('post_search', request, search)
|
|
77
|
+ self.assertTrue('Mock' in search.result_container.answers)
|
78
|
78
|
|
79
|
|
- ctx = get_search_mock(query='user-agent', pageno=2)
|
80
|
|
- store.call('post_search', request, ctx)
|
81
|
|
- self.assertFalse('Mock' in ctx['result_container'].answers)
|
|
79
|
+ search = get_search_mock(query='user-agent', pageno=2)
|
|
80
|
+ store.call('post_search', request, search)
|
|
81
|
+ self.assertFalse('Mock' in search.result_container.answers)
|
82
|
82
|
|
83
|
|
- ctx = get_search_mock(query='What is my User-Agent?', pageno=1)
|
84
|
|
- store.call('post_search', request, ctx)
|
85
|
|
- self.assertTrue('Mock' in ctx['result_container'].answers)
|
|
83
|
+ search = get_search_mock(query='What is my User-Agent?', pageno=1)
|
|
84
|
+ store.call('post_search', request, search)
|
|
85
|
+ self.assertTrue('Mock' in search.result_container.answers)
|
86
|
86
|
|
87
|
|
- ctx = get_search_mock(query='What is my User-Agent?', pageno=2)
|
88
|
|
- store.call('post_search', request, ctx)
|
89
|
|
- self.assertFalse('Mock' in ctx['result_container'].answers)
|
|
87
|
+ search = get_search_mock(query='What is my User-Agent?', pageno=2)
|
|
88
|
+ store.call('post_search', request, search)
|
|
89
|
+ self.assertFalse('Mock' in search.result_container.answers)
|