Merge branch 'QA_4_7'

phpmyadmin · Jun 28, 2017 · 4ee38fe · 4ee38fe
2 parents 0ceda63 + 49c9635
commit 4ee38fe
Showing 1 changed file with 40 additions and 0 deletions.
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
@@ -168,6 +168,46 @@ public function testHttpRequestCurl($url, $method, $return_only_status, $expecte
         $this->validateHttp($result, $expected);
     }
 
+    /**
+     * Test for http request using Curl with CURLOPT_CAPATH
+     *
+     * @group medium
+     *
+     * @return void
+     *
+     * @dataProvider httpRequests
+     *
+     * @group network
+     */
+    public function testHttpRequestCurlCAPath($url, $method, $return_only_status, $expected)
+    {
+        if (! function_exists('curl_init')) {
+            $this->markTestSkipped('curl not supported');
+        }
+        $result = PMA\libraries\Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAPATH);
+        $this->validateHttp($result, $expected);
+    }
+
+    /**
+     * Test for http request using Curl with CURLOPT_CAINFO
+     *
+     * @group medium
+     *
+     * @return void
+     *
+     * @dataProvider httpRequests
+     *
+     * @group network
+     */
+    public function testHttpRequestCurlCAInfo($url, $method, $return_only_status, $expected)
+    {
+        if (! function_exists('curl_init')) {
+            $this->markTestSkipped('curl not supported');
+        }
+        $result = PMA\libraries\Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAINFO);
+        $this->validateHttp($result, $expected);
+    }
+
     /**
      * Test for http request using fopen
      *