Use $transport::test() for checking SSL in tests

See #101. Turns out fsockopen was overriding this, but we have contextual checking support now, so let's use that.
WordPress · Mar 23, 2014 · dfafa2c · dfafa2c
1 parent 5072e6e
commit dfafa2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tests/Transport/Base.php b/tests/Transport/Base.php
@@ -2,10 +2,18 @@
 
 abstract class RequestsTest_Transport_Base extends PHPUnit_Framework_TestCase {
 	public function setUp() {
-		if (!call_user_func(array($this->transport, 'test'))) {
+		$callback = array($this->transport, 'test');
+		$supported = call_user_func($callback);
+
+		if (!$supported) {
 			$this->markTestSkipped($this->transport . ' is not available');
 			return;
 		}
+
+		$ssl_supported = call_user_func($callback, array('ssl' => true));
+		if (!$ssl_supported) {
+			$this->skip_https = true;
+		}
 	}
 	protected $skip_https = false;
 

diff --git a/tests/Transport/fsockopen.php b/tests/Transport/fsockopen.php
@@ -2,12 +2,4 @@
 
 class RequestsTest_Transport_fsockopen extends RequestsTest_Transport_Base {
 	protected $transport = 'Requests_Transport_fsockopen';
-
-	protected $skip_https = false;
-	public function setUp() {
-		// If OpenSSL isn't loaded, this should fail
-		if (!defined('OPENSSL_VERSION_NUMBER')) {
-			$this->skip_https = true;
-		}
-	}
 }