Merge pull request #726 from mouse-reeve/search-tests

Search tests

bookwyrm/connectors/abstract_connector.py

@@ -44,21 +44,10 @@ class AbstractMinimalConnector(ABC):
         if min_confidence:
             params["min_confidence"] = min_confidence
 
-        resp = requests.get(
+        data = get_data(
             "%s%s" % (self.search_url, query),
             params=params,
-            headers={
-                "Accept": "application/json; charset=utf-8",
-                "User-Agent": settings.USER_AGENT,
-            },
         )
-        if not resp.ok:
-            resp.raise_for_status()
-        try:
-            data = resp.json()
-        except ValueError as e:
-            logger.exception(e)
-            raise ConnectorException("Unable to parse json response", e)
         results = []
 
         for doc in self.parse_search_data(data)[:10]:
@@ -68,24 +57,14 @@ class AbstractMinimalConnector(ABC):
     def isbn_search(self, query):
         """ isbn search """
         params = {}
-        resp = requests.get(
+        data = get_data(
             "%s%s" % (self.isbn_search_url, query),
             params=params,
-            headers={
-                "Accept": "application/json; charset=utf-8",
-                "User-Agent": settings.USER_AGENT,
-            },
         )
-        if not resp.ok:
-            resp.raise_for_status()
-        try:
-            data = resp.json()
-        except ValueError as e:
-            logger.exception(e)
-            raise ConnectorException("Unable to parse json response", e)
         results = []
 
-        for doc in self.parse_isbn_search_data(data):
+        # this shouldn't be returning mutliple results, but just in case
+        for doc in self.parse_isbn_search_data(data)[:10]:
             results.append(self.format_isbn_search_result(doc))
         return results
 
@@ -234,11 +213,12 @@ def dict_from_mappings(data, mappings):
     return result
 
 
-def get_data(url):
+def get_data(url, params=None):
     """ wrapper for request.get """
     try:
         resp = requests.get(
             url,
+            params=params,
             headers={
                 "Accept": "application/json; charset=utf-8",
                 "User-Agent": settings.USER_AGENT,