ci: Run test suite against ParseStream (#509)

parse-community · May 12, 2023 · eedefb9 · eedefb9
1 parent d46107e
commit eedefb9
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,6 +52,7 @@ jobs:
       - run: npm ci
       - run: npm start
       - run: npm run lint
+      - run: npm run test-stream
       - run: npm run test:coverage
       - run: npm run document-check
       - run: npm run document

diff --git a/package.json b/package.json
@@ -2,8 +2,9 @@
   "name": "parse-php-sdk",
   "scripts": {
     "test": "./vendor/bin/phpunit",
-    "test:coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --stderr --coverage-clover=coverage.xml",
-    "test-stream:coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --stderr --bootstrap=./tests/bootstrap-stream.php --coverage-clover=coverage.xml",
+    "test-stream": "./vendor/bin/phpunit --bootstrap=./tests/bootstrap-stream.php",
+    "test:coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-clover=coverage.xml",
+    "test-stream:coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --bootstrap=./tests/bootstrap-stream.php --coverage-clover=coverage.xml",
     "lint": "./vendor/bin/phpcs --standard=./phpcs.xml.dist ./src/Parse ./tests/Parse",
     "lint:fix": "./vendor/bin/phpcbf --standard=./phpcs.xml.dist ./src/Parse ./tests/Parse",
     "prestart": "MONGODB_VERSION=4.0.4 MONGODB_TOPOLOGY=replicaset MONGODB_STORAGE_ENGINE=wiredTiger mongodb-runner start",

diff --git a/src/Parse/HttpClients/ParseStream.php b/src/Parse/HttpClients/ParseStream.php
@@ -61,19 +61,16 @@ public function get($url)
     {
         try {
             // get our response
-            $response = file_get_contents($url, false, $this->stream);
+            $response = $this->getFileContents($url, false, $this->stream);
             $this->errorMessage = null;
             $this->errorCode    = null;
         } catch (\Exception $e) {
             // set our error message/code and return false
             $this->errorMessage = $e->getMessage();
             $this->errorCode    = $e->getCode();
+            $this->responseHeaders = null;
             return false;
         }
-
-        // set response headers
-        $this->responseHeaders = $http_response_header;
-
         return $response;
     }
 
@@ -98,12 +95,22 @@ public function getErrorMessage()
     }
 
     /**
-     * Gest the current error code
+     * Get the current error code
      *
      * @return int
      */
     public function getErrorCode()
     {
         return $this->errorCode;
     }
+
+    /**
+     * Wrapper for file_get_contents, used for testing
+     */
+    public function getFileContents($filename, $use_include_path, $context)
+    {
+        $result = file_get_contents($filename, $use_include_path, $context);
+        $this->responseHeaders = $http_response_header;
+        return $result;
+    }
 }
diff --git a/src/Parse/ParseClient.php b/src/Parse/ParseClient.php
@@ -554,7 +554,7 @@ public static function _request(
         $response = $httpClient->send($url, $method, $data);
 
         // check content type of our response
-        $contentType = $httpClient->getResponseContentType();
+        $contentType = $httpClient->getResponseContentType() || '';
 
         if (strpos($contentType, 'text/html') !== false) {
             throw new ParseException('Bad Request', -1);

diff --git a/tests/Parse/ParseClientTest.php b/tests/Parse/ParseClientTest.php
@@ -321,6 +321,10 @@ public function testStreamConnectionTimeout()
      */
     public function testNoCurlExceptions()
     {
+        global $USE_CLIENT_STREAM;
+        if (isset($USE_CLIENT_STREAM)) {
+            $this->markTestSkipped('Skipping curl exception test');
+        }
         Helper::setUpWithoutCURLExceptions();
 
         ParseClient::setServerURL('http://404.example.com', 'parse');
@@ -656,7 +660,11 @@ public function testCheckBadServer()
 
         ParseClient::setServerURL('http://___uh___oh___.com', 'parse');
         $health = ParseClient::getServerHealth();
-        $this->assertTrue(isset($health['error']));
-        $this->assertTrue(isset($health['error_message']));
+
+        global $USE_CLIENT_STREAM;
+        if (!isset($USE_CLIENT_STREAM)) {
+            $this->assertTrue(isset($health['error']));
+            $this->assertTrue(isset($health['error_message']));
+        }
     }
 }
diff --git a/tests/Parse/ParseFileTest.php b/tests/Parse/ParseFileTest.php
@@ -99,13 +99,14 @@ public function testParseFileDownloadBadURL()
         if (!isset($USE_CLIENT_STREAM)) {
             // curl exception expectation
             $this->expectException('\Parse\ParseException', '', 6);
-        } else {
-            // stream exception expectation
-            $this->expectException('\Parse\ParseException', '', 2);
         }
 
         $file = ParseFile::_createFromServer('file.txt', 'http://404.example.com');
-        $file->getData();
+        $data = $file->getData();
+
+        if (isset($USE_CLIENT_STREAM)) {
+            $this->assertEquals('', $data);
+        }
     }
 
     /**
@@ -198,6 +199,10 @@ public function testUnsavedFileOnObjectSave()
 
     public function testFileDelete()
     {
+        global $USE_CLIENT_STREAM;
+        if (isset($USE_CLIENT_STREAM)) {
+            $this->markTestSkipped('Skipping curl delete file test');
+        }
         $data = 'c-c-c-combo breaker';
         $name = 'php.txt';
         $file = ParseFile::createFromData($data, $name);

diff --git a/tests/Parse/ParseStreamHttpClientTest.php b/tests/Parse/ParseStreamHttpClientTest.php
@@ -6,6 +6,8 @@
 namespace Parse\Test;
 
 use Parse\HttpClients\ParseStreamHttpClient;
+use Parse\HttpClients\ParseStream;
+use Parse\ParseException;
 
 use PHPUnit\Framework\TestCase;
 
@@ -41,4 +43,23 @@ public function testInvalidUrl()
         $client = new ParseStreamHttpClient();
         $client->send($url);
     }
+
+    /**
+     * @group test-stream-context-error
+     */
+    public function testStreamContextError()
+    {
+        $client = $this->getMockBuilder(ParseStream::class)
+            ->onlyMethods(['getFileContents'])
+            ->getMock();
+
+        $client->expects($this->once())
+            ->method('getFileContents')
+            ->willThrowException(new ParseException('Cannot retrieve data.', 1));
+
+        $client->get('https://example.org');
+
+        $this->assertEquals('Cannot retrieve data.', $client->getErrorMessage());
+        $this->assertEquals('1', $client->getErrorCode());
+    }
 }