Use API 2.0 for PR comments create/update/delete

Merged in 53Phil/bitbucket-api/pr-comments-v2 (pull request #44)

Author: Philip Nelson

lib/Bitbucket/API/Repositories/PullRequests/Comments.php

@@ -66,9 +66,10 @@ public function get($account, $repo, $requestID, $commentID)
      */
     public function create($account, $repo, $requestID, $content)
     {
-        return $this->requestPost(
+        return $this->getClient()->setApiVersion('2.0')->post(
             sprintf('repositories/%s/%s/pullrequests/%d/comments', $account, $repo, $requestID),
-            array('content' => $content)
+            json_encode(array('content' => array('raw' => $content))),
+            array('Content-Type' => 'application/json')
         );
     }
 
@@ -85,9 +86,10 @@ public function create($account, $repo, $requestID, $content)
      */
     public function update($account, $repo, $requestID, $commentID, $content)
     {
-        return $this->requestPut(
+        return $this->getClient()->setApiVersion('2.0')->put(
             sprintf('repositories/%s/%s/pullrequests/%d/comments/%d', $account, $repo, $requestID, $commentID),
-            array('content' => $content)
+            json_encode(array('content' => array('raw' => $content))),
+            array('Content-Type' => 'application/json')
         );
     }
 
@@ -103,7 +105,7 @@ public function update($account, $repo, $requestID, $commentID, $content)
      */
     public function delete($account, $repo, $requestID, $commentID)
     {
-        return $this->requestDelete(
+        return $this->getClient()->setApiVersion('2.0')->delete(
             sprintf('repositories/%s/%s/pullrequests/%d/comments/%d', $account, $repo, $requestID, $commentID)
         );
     }

test/Bitbucket/Tests/API/Repositories/PullRequests/CommentsTest.php

@@ -46,43 +46,50 @@ public function testGetSingleComment()
     public function testCreateCommentSuccess()
     {
         $endpoint       = 'repositories/gentle/eof/pullrequests/1/comments';
-        $params         = array(
-            'content'   => 'dummy comment'
-        );
+        $expectedResult = $this->fakeResponse(array('dummy'));
 
-        $comment = $this->getApiMock('Bitbucket\API\Repositories\PullRequests\Comments');
-        $comment->expects($this->once())
-            ->method('requestPost')
-            ->with($endpoint, $params);
+        $client = $this->getHttpClientMock();
+        $client->expects($this->once())
+            ->method('post')
+            ->with($endpoint)
+            ->will($this->returnValue($expectedResult));
 
-        /** @var $comment \Bitbucket\API\Repositories\PullRequests\Comments */
-        $comment->create('gentle', 'eof', 1, 'dummy comment');
+        /** @var \Bitbucket\API\Repositories\PullRequests\Comments $comments */
+        $comments = $this->getClassMock('Bitbucket\API\Repositories\PullRequests\Comments', $client);
+        $actual   = $comments->create('gentle', 'eof', 1, 'test');
+
+        $this->assertEquals($expectedResult, $actual);
     }
 
     public function testUpdateCommentSuccess()
     {
         $endpoint       = 'repositories/gentle/eof/pullrequests/1/comments/3';
-        $params         = array('content' => 'dummy');
+        $expectedResult = array('content' => 'dummy');
+
+        $client = $this->getHttpClientMock();
+        $client->expects($this->once())
+            ->method('put')
+            ->with($endpoint)
+            ->will($this->returnValue($expectedResult));
 
-        $comment = $this->getApiMock('Bitbucket\API\Repositories\PullRequests\Comments');
-        $comment->expects($this->once())
-            ->method('requestPut')
-            ->with($endpoint, $params);
+        /** @var \Bitbucket\API\Repositories\PullRequests\Comments $comments */
+        $comments = $this->getClassMock('Bitbucket\API\Repositories\PullRequests\Comments', $client);
+        $actual   = $comments->update('gentle', 'eof', 1, 3, 'dummy');
 
-        /** @var $comment \Bitbucket\API\Repositories\PullRequests\Comments */
-        $comment->update('gentle', 'eof', 1, 3, 'dummy');
+        $this->assertEquals($expectedResult, $actual);
     }
 
     public function testDeleteCommentSuccess()
     {
-        $endpoint       = 'repositories/gentle/eof/pullrequests/1/comments/2';
+        $endpoint = 'repositories/gentle/eof/pullrequests/1/comments/2';
 
-        $comment = $this->getApiMock('Bitbucket\API\Repositories\PullRequests\Comments');
-        $comment->expects($this->once())
-            ->method('requestDelete')
+        $client = $this->getHttpClientMock();
+        $client->expects($this->once())
+            ->method('delete')
             ->with($endpoint);
 
-        /** @var $comment \Bitbucket\API\Repositories\PullRequests\Comments */
-        $comment->delete('gentle', 'eof', 1, 2);
+        /** @var \Bitbucket\API\Repositories\PullRequests\Comments $comments */
+        $comments = $this->getClassMock('Bitbucket\API\Repositories\PullRequests\Comments', $client);
+        $comments->delete('gentle', 'eof', 1, 2);
     }
 }