Merge pull request #311 from scholarly-python-package/develop

v1.2.2a

Author: ipeirotis

test_module.py

@@ -45,8 +45,11 @@ def setUp(self):
         elif self.connection_method == "freeproxy":
             proxy_generator.FreeProxies()
             scholarly.use_proxy(proxy_generator)
+        elif self.connection_method == "scraperapi":   
+            proxy_generator.ScraperAPI(os.getenv('SCRAPER_API_KEY'))
+            scholarly.use_proxy(proxy_generator)
         else:
-            scholarly.use_proxy(None)
+            scholarly.use_proxy(None)      
 
     def test_tor_launch_own_process(self):
         """
@@ -228,13 +231,7 @@ def test_extract_author_id_list(self):
         author_id_list = pub_parser._get_author_id_list(author_html_partial)
         self.assertTrue(author_id_list[3] == 'TEndP-sAAAAJ')
 
-    def test_ScraperAPI(self):
-        proxy_generator = ProxyGenerator()
-        proxy_generator.ScraperAPI(os.getenv('SCRAPER_API_KEY'))
-        scholarly.set_timeout(60)
 
-        ## Uses another method to test that proxy is working.
-        self.test_search_keyword()
 
 
 if __name__ == '__main__':