replace merge_request endpoint by merge_requests

Author: fbourigault

lib/Gitlab/Api/MergeRequests.php

@@ -90,7 +90,7 @@ public function closed($project_id, $page = 1, $per_page = self::PER_PAGE, $orde
      */
     public function show($project_id, $mr_id)
     {
-        return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id)));
+        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id)));
     }
 
     /**
@@ -123,7 +123,7 @@ public function create($project_id, $source, $target, $title, $assignee = null,
      */
     public function update($project_id, $mr_id, array $params)
     {
-        return $this->put($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id)), $params);
+        return $this->put($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id)), $params);
     }
 
     /**
@@ -140,7 +140,7 @@ public function merge($project_id, $mr_id, $message = null)
             $params = array('merge_commit_message' => $message);
         }
 
-        return $this->put($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/merge'), $params);
+        return $this->put($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/merge'), $params);
     }
 
     /**
@@ -173,7 +173,7 @@ public function addNote($project_id, $mr_id, $note)
      */
     public function showComments($project_id, $mr_id)
     {
-        return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/comments'));
+        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/comments'));
     }
 
     /**
@@ -184,7 +184,7 @@ public function showComments($project_id, $mr_id)
      */
     public function addComment($project_id, $mr_id, $note)
     {
-        return $this->post($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/comments'), array(
+        return $this->post($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/comments'), array(
             'note' => $note
         ));
     }
@@ -196,7 +196,7 @@ public function addComment($project_id, $mr_id, $note)
      */
     public function changes($project_id, $mr_id)
     {
-        return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/changes'));
+        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/changes'));
     }
 
     /**
@@ -216,7 +216,7 @@ public function getByIid($project_id, $mr_iid)
      */
     public function commits($project_id, $mr_id)
     {
-        return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/commits'));
+        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/commits'));
     }
 
     /**
@@ -226,7 +226,7 @@ public function commits($project_id, $mr_id)
      */
     public function closesIssues($project_id, $mr_id)
     {
-        return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/closes_issues'));
+        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/closes_issues'));
     }
 
     /**

test/Gitlab/Tests/Api/MergeRequestsTest.php

@@ -168,7 +168,7 @@ public function shouldShowMergeRequest()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('projects/1/merge_request/2')
+            ->with('projects/1/merge_requests/2')
             ->will($this->returnValue($expectedArray))
         ;
 
@@ -233,7 +233,7 @@ public function shouldUpdateMergeRequest()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('projects/1/merge_request/2', array('title' => 'Updated title', 'description' => 'No so many changes now', 'state_event' => 'close'))
+            ->with('projects/1/merge_requests/2', array('title' => 'Updated title', 'description' => 'No so many changes now', 'state_event' => 'close'))
             ->will($this->returnValue($expectedArray))
         ;
 
@@ -254,7 +254,7 @@ public function shouldMergeMergeRequest()
         $api = $this->getApiMock();
         $api->expects($this->exactly(2))
             ->method('put')
-            ->with('projects/1/merge_request/2/merge', array('merge_commit_message' => 'Accepted'))
+            ->with('projects/1/merge_requests/2/merge', array('merge_commit_message' => 'Accepted'))
             ->will($this->returnValue($expectedArray))
         ;
 
@@ -295,7 +295,7 @@ public function shouldGetMergeRequestComments()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('projects/1/merge_request/2/comments')
+            ->with('projects/1/merge_requests/2/comments')
             ->will($this->returnValue($expectedArray))
         ;
 
@@ -312,7 +312,7 @@ public function shouldAddMergeRequestComment()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('post')
-            ->with('projects/1/merge_request/2/comments', array('note' => 'A comment'))
+            ->with('projects/1/merge_requests/2/comments', array('note' => 'A comment'))
             ->will($this->returnValue($expectedArray))
         ;
 
@@ -329,7 +329,7 @@ public function shouldGetMergeRequestChanges()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('projects/1/merge_request/2/changes')
+            ->with('projects/1/merge_requests/2/changes')
             ->will($this->returnValue($expectedArray))
         ;
 
@@ -347,7 +347,7 @@ public function shouldGetIssuesClosedByMergeRequest()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('projects/1/merge_request/2/closes_issues')
+            ->with('projects/1/merge_requests/2/closes_issues')
             ->will($this->returnValue($expectedArray))
         ;