fixes #26 - element() should throw WebDriver\Exception\NoSuchElement instead of null

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -103,13 +103,15 @@ public function getURL()
     protected function curl($requestMethod, $command, $parameters = null, $extraOptions = array())
     {
         if ($parameters && is_array($parameters) && $requestMethod !== 'POST') {
-            throw WebDriverException::factory(WebDriverException::NO_PARAMETERS_EXPECTED, sprintf(
-                'The http request method called for %s is %s but it has to be POST' .
-                ' if you want to pass the JSON parameters %s',
-                $command,
-                $requestMethod,
-                json_encode($parameters)
-            ));
+            throw WebDriverException::factory(
+                WebDriverException::NO_PARAMETERS_EXPECTED,
+                sprintf(
+                    'The http request method called for %s is %s but it has to be POST if you want to pass the JSON parameters %s',
+                    $command,
+                    $requestMethod,
+                    json_encode($parameters)
+                )
+            );
         }
 
         $url = sprintf('%s%s', $this->url, $command);
@@ -154,9 +156,9 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
     public function __call($name, $arguments)
     {
         if (count($arguments) > 1) {
-            throw WebDriverException::factory(WebDriverException::JSON_PARAMETERS_EXPECTED,
-                'Commands should have at most only one parameter,' .
-                ' which should be the JSON Parameter object'
+            throw WebDriverException::factory(
+                WebDriverException::JSON_PARAMETERS_EXPECTED,
+                'Commands should have at most only one parameter, which should be the JSON Parameter object'
             );
         }
 
@@ -170,11 +172,14 @@ public function __call($name, $arguments)
 
         $methods = $this->methods();
         if (!in_array($requestMethod, (array) $methods[$webdriverCommand])) {
-            throw WebDriverException::factory(WebDriverException::INVALID_REQUEST, sprintf(
-                '%s is not an available http request method for the command %s.',
-                $requestMethod,
-                $webdriverCommand
-            ));
+            throw WebDriverException::factory(
+                WebDriverException::INVALID_REQUEST,
+                sprintf(
+                    '%s is not an available http request method for the command %s.',
+                    $requestMethod,
+                    $webdriverCommand
+                )
+            );
         }
 
         $results = $this->curl(
@@ -198,7 +203,8 @@ public function __call($name, $arguments)
     private function getRequestMethod($webdriverCommand)
     {
         if (!array_key_exists($webdriverCommand, $this->methods())) {
-            throw WebDriverException::factory(array_key_exists($webdriverCommand, $this->obsoleteMethods())
+            throw WebDriverException::factory(
+                array_key_exists($webdriverCommand, $this->obsoleteMethods())
                 ? WebDriverException::OBSOLETE_COMMAND : WebDriverException::UNKNOWN_COMMAND,
                 sprintf('%s is not a valid WebDriver command.', $webdriverCommand)
             );

lib/WebDriver/Container.php

@@ -66,15 +66,32 @@ public function element($using = null, $value = null)
                 $locatorJson
             );
         } catch (WebDriverException\NoSuchElement $e) {
+            throw WebDriverException::factory(
+                WebDriverException::NO_SUCH_ELEMENT,
+                sprintf(
+                    "Element not found with %s, %s\n\n%s",
+                    $locatorJson['using'],
+		    $locatorJson['value'],
+                    $e->getMessage()
+                ),
+                $e
+            );
+        }
+
+        $element = $this->webDriverElement($results['value']);
+
+        if ($element === null) {
             throw WebDriverException::factory(WebDriverException::NO_SUCH_ELEMENT,
                 sprintf(
-                    'Element not found with %s, %s',
+                    "Element not found with %s, %s\n\n%s",
                     $locatorJson['using'],
-                    $locatorJson['value']) . "\n\n" . $e->getMessage(), $e
+                    $locatorJson['value'],
+                    $e->getMessage()
+                )
             );
         }
 
-        return $this->webDriverElement($results['value']);
+        return $element;
     }
 
     /**
@@ -138,7 +155,8 @@ private function parseArgs($method, $argv)
                 }
 
             default:
-                throw WebDriverException::factory(WebDriverException::JSON_PARAMETERS_EXPECTED,
+                throw WebDriverException::factory(
+                    WebDriverException::JSON_PARAMETERS_EXPECTED,
                     sprintf('Invalid arguments to %s method: %s', $method, print_r($argv, true))
                 );
         }
@@ -159,7 +177,8 @@ private function parseArgs($method, $argv)
     public function locate($using, $value)
     {
         if (!in_array($using, $this->strategies)) {
-            throw WebDriverException::factory(WebDriverException::UNKNOWN_LOCATOR_STRATEGY,
+            throw WebDriverException::factory(
+                WebDriverException::UNKNOWN_LOCATOR_STRATEGY,
                 sprintf('Invalid locator strategy %s', $using)
             );
         }