@@ -10,15 +10,15 @@ class TestGoogleImagesEngine(SearxTestCase):
1010 query = 'test_query'
1111 dicto = defaultdict(dict)
1212 dicto['pageno'] = 1
13+ dicto['safesearch'] = 1
1314 params = google_images.request(query, dicto)
1415 self.assertIn('url', params)
1516 self.assertIn(query, params['url'])
16− self.assertIn('googleapis.com', params['url'])
17− self.assertIn('safe=on', params['url'])
17+ self.assertIn('safe=active', params['url'])
1818
1919 dicto['safesearch'] = 0
2020 params = google_images.request(query, dicto)
21− self.assertIn('safe=off', params['url'])
21+ self.assertNotIn('safe', params['url'])
2222
2323 def test_response(self):
2424 self.assertRaises(AttributeError, google_images.response, None)
@@ -26,88 +26,33 @@ class TestGoogleImagesEngine(SearxTestCase):
2626 self.assertRaises(AttributeError, google_images.response, '')
2727 self.assertRaises(AttributeError, google_images.response, '[]')
2828
29− response = mock.Mock(text='{}')
29+ response = mock.Mock(text='<div></div>')
3030 self.assertEqual(google_images.response(response), [])
3131
32− response = mock.Mock(text='{"data": []}')
33− self.assertEqual(google_images.response(response), [])
34−
35− json = """
36− {
37− "responseData": {
38− "results": [
39− {
40− "GsearchResultClass": "GimageSearch",
41− "width": "400",
42− "height": "400",
43− "imageId": "ANd9GcQbYb9FJuAbG_hT4i8FeC0O0x-P--EHdzgRIF9ao97nHLl7C2mREn6qTQ",
44− "tbWidth": "124",
45− "tbHeight": "124",
46− "unescapedUrl": "http://unescaped.url.jpg",
47− "url": "http://image.url.jpg",
48− "visibleUrl": "insolitebuzz.fr",
49− "title": "This is the title",
50− "titleNoFormatting": "Petit test sympa qui rend fou tout le monde ! A faire",
51− "originalContextUrl": "http://this.is.the.url",
52− "content": "<b>test</b>",
53− "contentNoFormatting": "test",
54− "tbUrl": "http://thumbnail.url"
55− }
56− ]
57− },
58− "responseDetails": null,
59− "responseStatus": 200
60− }
61− """
62− response = mock.Mock(text=json)
32+ html = """
33+<div style="display:none">
34+ <div eid="fWhnVq4Shqpp3pWo4AM" id="isr_scm_1" style="display:none"></div>
35+ <div data-cei="fWhnVq4Shqpp3pWo4AM" class="rg_add_chunk"><!--m-->
36+ <div class="rg_di rg_el ivg-i" data-ved="0ahUKEwjuxPWQts3JAhUGVRoKHd4KCjwQMwgDKAAwAA">
37+ <a href="/imgres?imgurl=http://www.clker.com/cliparts/H/X/l/b/0/0/south-arrow-hi.png&imgrefurl=http://www.clker.com/clipart-south-arrow.html&h=598&w=504&tbnid=bQWQ9wz9loJmjM:&docid=vlONkeBtERfDuM&ei=fWhnVq4Shqpp3pWo4AM&tbm=isch" jsaction="fire.ivg_o;mouseover:str.hmov;mouseout:str.hmou" class="rg_l"><img data-src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRsxy3gKnEX0lrwwpRxdPWyLJ8iZ--PXZ-ThbBA2_xXDG_bdQutMQ" data-sz="f" name="bQWQ9wz9loJmjM:" class="rg_i" alt="Image result for south" jsaction="load:str.tbn" onload="google.aft&&google.aft(this)">
38+ <div class="_aOd rg_ilm">
39+ <div class="rg_ilmbg"><span class="rg_ilmn"> 504 × 598 - clker.com </span>
40+ </div>
41+ </div>
42+ </a>
43+ <div class="rg_meta">
44+ {"id":"bQWQ9wz9loJmjM:","isu":"clker.com","ity":"png","md":"/search?tbs\u003dsbi:AMhZZit7u1mHyop9pQisu-5idR-8W_1Itvwc3afChmsjQYPx_1yYMzBvUZgtkcGoojqekKZ-6n_1rjX9ySH0OWA_1eO5OijFY6BBDw_1GApr6xxb1bXJcBcj-DiguMoXWW7cZSG7MRQbwnI5SoDZNXcv_1xGszy886I7NVb_1oRKSliTHtzqbXAxhvYreM","msu":"/search?q\u003dsouth\u0026biw\u003d1364\u0026bih\u003d235\u0026tbm\u003disch\u0026tbs\u003dsimg:CAQSEgltBZD3DP2WgiG-U42R4G0RFw","oh":598,"os":"13KB","ow":504,"pt":"South Arrow Clip Art at Clker.com - vector clip art online ...","rid":"vlONkeBtERfDuM","s":"Download this image as:","sc":1,"si":"/search?q\u003dsouth\u0026biw\u003d1364\u0026bih\u003d235\u0026tbm\u003disch\u0026tbs\u003dsimg:CAESEgltBZD3DP2WgiG-U42R4G0RFw","th":245,"tu":"https://thumbnail.url/","tw":206}
45+ </div>
46+ </div><!--n--><!--m-->
47+ </div>
48+</div>
49+ """ # noqa
50+ response = mock.Mock(text=html)
6351 results = google_images.response(response)
6452 self.assertEqual(type(results), list)
6553 self.assertEqual(len(results), 1)
66− self.assertEqual(results[0]['title'], 'This is the title')
67− self.assertEqual(results[0]['url'], 'http://this.is.the.url')
68− self.assertEqual(results[0]['thumbnail_src'], 'https://thumbnail.url')
69− self.assertEqual(results[0]['img_src'], 'http://image.url.jpg')
70− self.assertEqual(results[0]['content'], '<b>test</b>')
71−
72− json = """
73− {
74− "responseData": {
75− "results": [
76− {
77− "GsearchResultClass": "GimageSearch",
78− "width": "400",
79− "height": "400",
80− "imageId": "ANd9GcQbYb9FJuAbG_hT4i8FeC0O0x-P--EHdzgRIF9ao97nHLl7C2mREn6qTQ",
81− "tbWidth": "124",
82− "tbHeight": "124",
83− "unescapedUrl": "http://unescaped.url.jpg",
84− "visibleUrl": "insolitebuzz.fr",
85− "title": "This is the title",
86− "titleNoFormatting": "Petit test sympa qui rend fou tout le monde ! A faire",
87− "originalContextUrl": "http://this.is.the.url",
88− "content": "<b>test</b>",
89− "contentNoFormatting": "test",
90− "tbUrl": "http://thumbnail.url"
91− }
92− ]
93− },
94− "responseDetails": null,
95− "responseStatus": 200
96− }
97− """
98− response = mock.Mock(text=json)
99− results = google_images.response(response)
100− self.assertEqual(type(results), list)
101− self.assertEqual(len(results), 0)
102−
103− json = """
104− {
105− "responseData": {},
106− "responseDetails": null,
107− "responseStatus": 200
108− }
109− """
110− response = mock.Mock(text=json)
111− results = google_images.response(response)
112− self.assertEqual(type(results), list)
113− self.assertEqual(len(results), 0)
54+ self.assertEqual(results[0]['title'], u'South Arrow Clip Art at Clker.com - vector clip art online ...')
55+ self.assertEqual(results[0]['url'], 'http://www.clker.com/clipart-south-arrow.html')
56+ self.assertEqual(results[0]['thumbnail_src'], 'https://thumbnail.url/')
57+ self.assertEqual(results[0]['img_src'], 'http://www.clker.com/cliparts/H/X/l/b/0/0/south-arrow-hi.png')
58+ self.assertEqual(results[0]['content'], 'Download this image as:')