Add new tests

ssitdikov · Jan 2, 2018 · e792010 · e792010
1 parent 8bf262a
commit e792010
Show file tree

Hide file tree

Showing 10 changed files with 264 additions and 45 deletions.
diff --git a/examples/example.php b/examples/example.php
@@ -1,11 +1,18 @@
 <?php
 
 use SSitdikov\TelegraphAPI\Client\TelegraphClient;
-
-use SSitdikov\TelegraphAPI\Type\{Account, Page, PageList, PageViews};
-use SSitdikov\TelegraphAPI\Type\ContentType\{LinkType, ImageType, YoutubeType};
-use SSitdikov\TelegraphAPI\Request\{CreateAccountRequest, EditAccountInfoRequest, GetAccountInfoRequest, RevokeAccessTokenRequest};
-use SSitdikov\TelegraphAPI\Request\{CreatePageRequest, EditPageRequest, GetPageRequest, GetPageListRequest, GetViewsRequest};
+use SSitdikov\TelegraphAPI\Request\{
+    CreateAccountRequest, EditAccountInfoRequest
+};
+use SSitdikov\TelegraphAPI\Request\{
+    CreatePageRequest
+};
+use SSitdikov\TelegraphAPI\Type\{
+    Account, Page
+};
+use SSitdikov\TelegraphAPI\Type\ContentType\{
+    ImageType, LinkType
+};
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -27,7 +34,7 @@
 
     $page = new Page();
     $page->setTitle('Test article');
-    $page->setAuthorName( $account->getAuthorName() );
+    $page->setAuthorName($account->getAuthorName());
 
     $link = new LinkType();
     $link->setHref('https://github.com/ssitdikov');
@@ -41,7 +48,6 @@
     $page = $telegraph->createPage(
         new CreatePageRequest($page, $account)
     );
-
 } catch (\Exception $e) {
     // logger
 }
diff --git a/src/Client/TelegraphClient.php b/src/Client/TelegraphClient.php
@@ -28,6 +28,11 @@ public function __construct(Client $client)
         $this->client = $client;
     }
 
+    public function createAccount(CreateAccountRequest $request): Account
+    {
+        return $this->doRequest($request);
+    }
+
     private function doRequest(RequestInterface $request)
     {
         $response = $this->client->request(
@@ -38,11 +43,6 @@ private function doRequest(RequestInterface $request)
         return $request->handleResponse($response);
     }
 
-    public function createAccount(CreateAccountRequest $request): Account
-    {
-        return $this->doRequest($request);
-    }
-
     public function editAccountInfo(EditAccountInfoRequest $request): Account
     {
         return $this->doRequest($request);

diff --git a/src/Request/AbstractPageRequest.php b/src/Request/AbstractPageRequest.php
@@ -24,6 +24,11 @@ public function isReturnContent($returnContent = true)
         $this->returnContent = $returnContent;
     }
 
+    public function getReturnContent()
+    {
+        return $this->returnContent;
+    }
+
     public function getMethod(): string
     {
         return self::POST;

diff --git a/src/Request/CreatePageRequest.php b/src/Request/CreatePageRequest.php
@@ -46,7 +46,6 @@ public function handleResponse(ResponseInterface $response): Page
             switch ($json->error) {
                 case ('CONTENT_TEXT_REQUIRED'):
                     throw new ContentTextRequired();
-                    break;
                 default:
                     throw new \Exception($json->error);
             }

diff --git a/src/Request/GetPageRequest.php b/src/Request/GetPageRequest.php
@@ -35,6 +35,9 @@ public function handleResponse(ResponseInterface $response): Page
         if (isset($json->result->can_edit)) {
             $this->page->setCanEdit($json->result->can_edit);
         }
+        if (isset($json->result->image_url)) {
+            $this->page->setImageUrl($json->result->image_url);
+        }
         if ($this->returnContent) {
             $this->page->setContent($json->result->content);
         }

diff --git a/tests/Account/CreateAccountRequestTest.php b/tests/Account/CreateAccountRequestTest.php
@@ -2,8 +2,8 @@
 
 namespace SSitdikov\TelegraphAPI\Tests\Account;
 
-use SSitdikov\TelegraphAPI\Request\CreateAccountRequest;
 use PHPUnit\Framework\TestCase;
+use SSitdikov\TelegraphAPI\Request\CreateAccountRequest;
 use SSitdikov\TelegraphAPI\Request\RequestInterface;
 use SSitdikov\TelegraphAPI\Type\Account;
 

diff --git a/tests/Account/GetPageRequestTest.php b/tests/Account/GetPageRequestTest.php
@@ -2,8 +2,8 @@
 
 namespace SSitdikov\TelegraphAPI\Tests\Account;
 
-use SSitdikov\TelegraphAPI\Request\GetAccountInfoRequest;
 use PHPUnit\Framework\TestCase;
+use SSitdikov\TelegraphAPI\Request\GetAccountInfoRequest;
 use SSitdikov\TelegraphAPI\Request\RequestInterface;
 use SSitdikov\TelegraphAPI\Type\Account;
 
@@ -27,7 +27,11 @@ public function simpleGetAccountInfo()
             'json' => [
                 'access_token' => $accessToken,
                 'fields' => [
-                    'short_name', 'author_name', 'author_url', 'auth_url', 'page_count'
+                    'short_name',
+                    'author_name',
+                    'author_url',
+                    'auth_url',
+                    'page_count'
                 ]
             ]
         ];