Merge pull request #64 from douglasdcm/exception-if-element-not-found

Raise exceptions when element not found

Author: douglasdcm

caqui/asynchronous.py

@@ -21,8 +21,10 @@ async def __post(url, payload):
             async with session.post(
                 url, data=json.dumps(payload), headers=HEADERS
             ) as resp:
-                response = await resp.json()
-                return response
+                status = resp.status
+                if status in range(200, 399):
+                    return await resp.json()
+                raise WebDriverError(f"Status code: {resp.status}, {resp.text}")
     except Exception as error:
         raise WebDriverError("'POST' request failed.") from error
 
@@ -31,8 +33,10 @@ async def __get(url):
     try:
         async with aiohttp.ClientSession() as session:
             async with session.get(url, headers=HEADERS) as resp:
-                response = await resp.json()
-                return response
+                status = resp.status
+                if status in range(200, 399):
+                    return await resp.json()
+                raise WebDriverError(f"Status code: {resp.status}, {resp.text}")
     except Exception as error:
         raise WebDriverError("'GET' request failed.") from error
 
@@ -370,6 +374,10 @@ async def find_element(driver_url, session, locator_type, locator_value):
         payload = {"using": locator_type, "value": locator_value}
         url = f"{driver_url}/session/{session}/element"
         response = await __post(url, payload)
+        if response.get("value").get("error"):
+            raise WebDriverError(f"Failed to find element. {response}")
+        if response.get("status") > 0:
+            raise WebDriverError(f"Failed to find element. {response}")
         return helper.get_element(response)
     except Exception as error:
         raise WebDriverError(

caqui/synchronous.py

@@ -22,10 +22,11 @@ def __get(url):
 
 
 def __post(url, payload):
+    response = requests.request("POST", url, headers=HEADERS, data=json.dumps(payload))
     try:
-        return requests.request(
-            "POST", url, headers=HEADERS, data=json.dumps(payload)
-        ).json()
+        if response.status_code in range(200, 399):
+            return response.json()
+        raise WebDriverError(f"Status code: {response.status_code}, {response.text}")
     except Exception as error:
         raise WebDriverError("'POST' request failed.") from error
 
@@ -385,6 +386,8 @@ def find_element(driver_url, session, locator_type, locator_value):
         # It helps on debug
         if response.get("value").get("error"):
             raise WebDriverError(f"Failed to find element. {response}")
+        if response.get("status") > 0:
+            raise WebDriverError(f"Failed to find element. {response}")
         return helper.get_element(response)
     except Exception as error:
         raise WebDriverError(

pyproject.toml

@@ -8,7 +8,7 @@ exclude = ["tests*", "utils", ".vscode", ".git*", "dist"]
 
 [project]
 name = "caqui"
-version = "1.12.0"
+version = "1.13.0"
 authors = [
   { name="Douglas Cardoso", email="noemail@noemail.com" },
 ]

tests/feature/test_sync_and_async.py

@@ -1,6 +1,7 @@
-from pytest import fixture, mark
+from pytest import fixture, mark, raises
 from caqui import asynchronous, synchronous
 from tests.constants import PAGE_URL
+from caqui.exceptions import WebDriverError
 
 
 @fixture
@@ -25,6 +26,21 @@ def __setup():
     synchronous.close_session(driver_url, session)
 
 
+@mark.asyncio
+async def test_raise_exception_when_element_not_found(__setup):
+    driver_url, session = __setup
+    locator_type = "xpath"
+    locator_value = "//invalid-tag"
+
+    with raises(WebDriverError):
+        synchronous.find_element(driver_url, session, locator_type, locator_value)
+
+    with raises(WebDriverError):
+        await asynchronous.find_element(
+            driver_url, session, locator_type, locator_value
+        )
+
+
 @mark.asyncio
 async def test_set_timeouts(__setup):
     driver_url, session = __setup