Add transient (one-time) options that only apply to the next curl service call; fixes #53

Author: robocoder

lib/WebDriver/AbstractWebDriver.php

@@ -47,6 +47,13 @@ abstract class AbstractWebDriver
      */
     private $curlService;
 
+    /**
+     * Transient options
+     *
+     * @var array
+     */
+    private $transientOptions;
+
     /**
      * Return array of supported method names and corresponding HTTP request methods
      *
@@ -114,6 +121,16 @@ public function getCurlService()
         return $this->curlService ?: ServiceFactory::getInstance()->getService('service.curl');
     }
 
+    /**
+     * Set transient options
+     *
+     * @param array $transientOptions
+     */
+    public function setTransientOptions($transientOptions)
+    {
+        $this->transientOptions = is_array($transientOptions) ? $transientOptions : array();
+    }
+
     /**
      * Curl request to webdriver server.
      *
@@ -147,7 +164,9 @@ protected function curl($requestMethod, $command, $parameters = null, $extraOpti
             $url .= '/' . $parameters;
         }
 
-        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, $extraOptions);
+        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, array_merge($extraOptions, $this->transientOptions));
+
+        $this->transientOptions = array();
 
         $httpCode = $info['http_code'];
 

lib/WebDriver/SauceLabs/SauceRest.php

@@ -48,6 +48,13 @@ class SauceRest
      */
     private $curlService;
 
+    /**
+     * Transient options
+     *
+     * @var array
+     */
+    private $transientOptions;
+
     /**
      * Constructor
      *
@@ -80,20 +87,31 @@ public function getCurlService()
         return $this->curlService ?: ServiceFactory::getInstance()->getService('service.curl');
     }
 
+    /**
+     * Set transient options
+     *
+     * @param array $transientOptions
+     */
+    public function setTransientOptions($transientOptions)
+    {
+        $this->transientOptions = is_array($transientOptions) ? $transientOptions : array();
+    }
+
     /**
      * Execute Sauce Labs REST API command
      *
      * @param string $requestMethod HTTP request method
      * @param string $url           URL
      * @param mixed  $parameters    Parameters
+     * @param array  $extraOptions  key=>value pairs of curl options to pass to curl_setopt()
      *
      * @return mixed
      *
      * @throws \WebDriver\Exception\CurlExec
      *
      * @see http://saucelabs.com/docs/saucerest
      */
-    protected function execute($requestMethod, $url, $parameters = null)
+    protected function execute($requestMethod, $url, $parameters = null, $extraOptions = array())
     {
         $extraOptions = array(
             CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
@@ -109,7 +127,9 @@ protected function execute($requestMethod, $url, $parameters = null)
 
         $url = 'https://saucelabs.com/rest/v1/' . $url;
 
-        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, $extraOptions);
+        list($rawResult, $info) = $this->curlService->execute($requestMethod, $url, $parameters, array_merge($extraOptions, $this->transientOptions));
+
+        $this->transientOptions = array();
 
         return json_decode($rawResult, true);
     }