Adds test for recursive folder functionality of GithubAdapter::listContents()

- Adds keys to provided data for easy idintifiaction in case of failure
- Adds JSON file as fixture

Author: Potherca

tests/fixtures/listContents-folder-recursive.json

@@ -0,0 +1,46 @@
+{
+    "sha": "676a09fd1c7df28938e8c12dc5d9f3c3271f0249",
+    "url": "https://api.github.com/repos/potherca-bot/test-repository/git/trees/676a09fd1c7df28938e8c12dc5d9f3c3271f0249",
+    "tree": [
+        {
+            "path": "README",
+            "mode": "100755",
+            "type": "blob",
+            "sha": "1ff3a296caf2d27828dd8c40673c88dbf99d4b3a",
+            "size": 58,
+            "url": "https://api.github.com/repos/potherca-bot/test-repository/git/blobs/1ff3a296caf2d27828dd8c40673c88dbf99d4b3a"
+        },
+        {
+            "path": "a-directory",
+            "mode": "040000",
+            "type": "tree",
+            "sha": "30b7e362894eecb159ce0ba2921a8363cd297213",
+            "url": "https://api.github.com/repos/potherca-bot/test-repository/git/trees/30b7e362894eecb159ce0ba2921a8363cd297213"
+        },
+        {
+            "path": "a-directory/another-file.js",
+            "mode": "100755",
+            "type": "blob",
+            "sha": "f542363e1b45aa7a33e5e731678dee18f7a1e729",
+            "size": 52,
+            "url": "https://api.github.com/repos/potherca-bot/test-repository/git/blobs/f542363e1b45aa7a33e5e731678dee18f7a1e729"
+        },
+        {
+            "path": "a-directory/readme.txt",
+            "mode": "100755",
+            "type": "blob",
+            "sha": "27f8ec8435cb07992ecf18f9d5494ffc14948368",
+            "size": 31,
+            "url": "https://api.github.com/repos/potherca-bot/test-repository/git/blobs/27f8ec8435cb07992ecf18f9d5494ffc14948368"
+        },
+        {
+            "path": "a-file.php",
+            "mode": "100755",
+            "type": "blob",
+            "sha": "c6e6cd91e3ae40ab74883720a0d6cfb2af89e4b1",
+            "size": 117,
+            "url": "https://api.github.com/repos/potherca-bot/test-repository/git/blobs/c6e6cd91e3ae40ab74883720a0d6cfb2af89e4b1"
+        }
+    ],
+    "truncated": false
+}

tests/unit-tests/GithubAdapterTest.php

@@ -1,8 +1,10 @@
 <?php
 
-
 namespace Potherca\Flysystem\Github;
 
+use PHPUnit_Framework_MockObject_Matcher_Parameters;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 /**
  * Tests for the  GithubAdapter class
  *
@@ -15,10 +17,11 @@ class GithubAdapterTest extends \PHPUnit_Framework_TestCase
 {
     ////////////////////////////////// FIXTURES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
     const MOCK_FILE_PATH = '/path/to/mock/file';
+    const MOCK_FOLDER_PATH = 'a-directory';
 
     /** @var GithubAdapter  */
     private $adapter;
-    /** @var ApiInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ApiInterface|MockObject */
     private $mockClient;
 
     /**
@@ -46,13 +49,23 @@ protected function setup()
      * @param $method
      * @param $apiMethod
      * @param $parameters
+     * @param mixed $returnValue
      */
-    final public function testAdapterShouldPassParameterToClient($method, $apiMethod, $parameters)
+    final public function testAdapterShouldPassParameterToClient($method, $apiMethod, $parameters, $returnValue = null)
     {
-        $mocker = $this->mockClient->expects($this->exactly(1))
-            ->method($apiMethod);
+        if (is_string($returnValue) && is_file(sprintf('%s/../fixtures/%s.json', __DIR__, $returnValue))) {
+            $fixturePath = sprintf('%s/../fixtures/%s.json', __DIR__, $returnValue);
+            $fixture = json_decode(file_get_contents($fixturePath), true);
+            $returnValue = $fixture['tree'];
+        }
+
+
+        $mocker = $this->mockClient->expects(self::exactly(1))
+            ->method($apiMethod)
+            ->willReturn($returnValue)
+        ;
 
-        $mocker->getMatcher()->parametersMatcher = new \PHPUnit_Framework_MockObject_Matcher_Parameters($parameters);
+        $mocker->getMatcher()->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_Parameters($parameters);
 
         call_user_func_array([$this->adapter, $method], $parameters);
     }
@@ -63,14 +76,17 @@ final public function testAdapterShouldPassParameterToClient($method, $apiMethod
     final public function provideReadMethods()
     {
         return [
-            ['has', 'exists', [self::MOCK_FILE_PATH]],
-            ['read', 'getFileContents', [self::MOCK_FILE_PATH]],
-            ['listContents', 'getTreeMetadata', [self::MOCK_FILE_PATH, true]],
-            ['getMetadata', 'getMetadata', [self::MOCK_FILE_PATH]],
-            ['getSize', 'getMetadata', [self::MOCK_FILE_PATH]],
-            ['getMimetype', 'guessMimeType', [self::MOCK_FILE_PATH]],
-            ['getTimestamp', 'getLastUpdatedTimestamp', [self::MOCK_FILE_PATH]],
-            ['getVisibility', 'getTreeMetadata', [self::MOCK_FILE_PATH, false]],
+            'has' => ['has', 'exists', [self::MOCK_FILE_PATH]],
+            'read' => ['read', 'getFileContents', [self::MOCK_FILE_PATH]],
+            'listContents - File' => ['listContents', 'getTreeMetadata', [self::MOCK_FILE_PATH, false]],
+            'listContents - File - recursive' => ['listContents', 'getTreeMetadata', [self::MOCK_FILE_PATH, true]],
+            'listContents - Folder' => ['listContents', 'getTreeMetadata', [self::MOCK_FOLDER_PATH, false], ''],
+            'listContents - Folder - recursive' => ['listContents', 'getTreeMetadata', [self::MOCK_FOLDER_PATH, true], 'listContents-folder-recursive'],
+            'getMetadata' => ['getMetadata', 'getMetadata', [self::MOCK_FILE_PATH]],
+            'getSize' => ['getSize', 'getMetadata', [self::MOCK_FILE_PATH]],
+            'getMimetype' => ['getMimetype', 'guessMimeType', [self::MOCK_FILE_PATH]],
+            'getTimestamp' => ['getTimestamp', 'getLastUpdatedTimestamp', [self::MOCK_FILE_PATH]],
+            'getVisibility' => ['getVisibility', 'getTreeMetadata', [self::MOCK_FILE_PATH]],
         ];
     }
 }