Added secure server flag for https selenium servers

Author: pankaj-a

PHPUnit/Extensions/Selenium2TestCase.php

@@ -256,7 +256,8 @@ public function __construct($name = NULL, array $data = array(), $dataName = '')
             'browser' => NULL,
             'browserName' => NULL,
             'desiredCapabilities' => array(),
-            'seleniumServerRequestsTimeout' => 60
+            'seleniumServerRequestsTimeout' => 60,
+            'secure' => FALSE
         );
 
         $this->keysHolder = new PHPUnit_Extensions_Selenium2TestCase_KeysHolder();
@@ -377,7 +378,7 @@ protected function runTest()
         } catch (Exception $e) {
             $thrownException = $e;
         }
-        
+
         if ($this->collectCodeCoverageInformation) {
             $this->session->cookie()->remove('PHPUNIT_SELENIUM_TEST_ID');
         }
@@ -456,6 +457,24 @@ public function getPort()
         return $this->parameters['port'];
     }
 
+    /**
+     * @param boolean $secure
+     * @throws InvalidArgumentException
+     */
+    public function setSecure($secure)
+    {
+        if(!is_bool($secure)) {
+            throw InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->parameters['secure'] = $secure;
+    }
+
+    public function getSecure()
+    {
+        return $this->parameters['secure'];
+    }
+
     /**
      * @param  string $browser
      * @throws InvalidArgumentException

PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php

@@ -58,6 +58,7 @@ interface PHPUnit_Extensions_Selenium2TestCase_SessionStrategy
     /**
      * @param array $parameters 'host' => Selenium Server machine
                                 'port' => Selenium Server port
+                                'secure' => Selenium Server secure flag
                                 'browser' => a browser name 
      *                          'browserUrl' => base URL to use during the test
      */

PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php

@@ -58,7 +58,7 @@ class PHPUnit_Extensions_Selenium2TestCase_SessionStrategy_Isolated
 {
     public function session(array $parameters)
     {
-        $seleniumServerUrl = PHPUnit_Extensions_Selenium2TestCase_URL::fromHostAndPort($parameters['host'], $parameters['port']);
+        $seleniumServerUrl = PHPUnit_Extensions_Selenium2TestCase_URL::fromHostAndPort($parameters['host'], $parameters['port'], $parameters['secure']);
         $driver = new PHPUnit_Extensions_Selenium2TestCase_Driver($seleniumServerUrl, $parameters['seleniumServerRequestsTimeout']);
         $capabilities = array_merge($parameters['desiredCapabilities'],
                                     array(

PHPUnit/Extensions/Selenium2TestCase/URL.php

@@ -71,10 +71,14 @@ public function __construct($value)
     /**
      * @param string $host
      * @param int port
+     * @param bool secure
      * @return PHPUnit_Extensions_Selenium2TestCase_URL
      */
-    public static function fromHostAndPort($host, $port)
+    public static function fromHostAndPort($host, $port, $secure)
     {
+        if($secure) {
+            return new self("https://{$host}:{$port}");
+        }
         return new self("http://{$host}:{$port}");
     }