Merge branch 'topic/MergeMergeRequest' into develop

IntegrationTest.py

@@ -185,10 +185,12 @@ class IntegrationTest:
                         else:
                             uncoveredApis.add( verb + " " + currentApi )
 
-        if len( uncoveredMethods ) != 0 or len( uncoveredApis ) != 0:
-            print
-            print "Not covered (" + str( len( uncoveredMethods ) + len( uncoveredApis ) ) + "):"
+        print
+        if len( uncoveredMethods ) != 0:
+            print "Not covered (" + str( len( uncoveredMethods ) ) + "):"
             print "\n".join( sorted( uncoveredMethods ) )
+        if len( uncoveredApis ) != 0:
+            print "Not implemented (" + str( len( uncoveredApis ) ) + "):"
             print "\n".join( sorted( uncoveredApis ) )
 
     def testAuthenticatedUserDetails( self ):
@@ -479,6 +481,13 @@ class IntegrationTest:
         k.delete()
         self.printList( "Keys", u.get_keys(), lambda k: k.title )
 
+    def testMergePullRequest( self ):
+        r = self.g.get_user().get_repo( "TestPyGithub" )
+        p = r.get_pull( 26 )
+        assert not p.is_merged()
+        p.merge()
+        assert p.is_merged()
+
     def testNamedUserDetails( self ):
         u = self.g.get_user( "jacquev6" )
         print u.login, "(" + u.name + ") is from", u.location

ReferenceOfApis.md

@@ -343,8 +343,8 @@ API `/repos/:user/:repo/pulls/:id/files`
 
 API `/repos/:user/:repo/pulls/:id/merge`
 ========================================
-* GET: (TODO)
-* PUT: (TODO)
+* GET: `PullRequest.is_merged`
+* PUT: `PullRequest.merge`
 
 API `/repos/:user/:repo/pulls/comments/:id`
 ===========================================

github/Github.UnitTest.py

@@ -91,4 +91,16 @@ class TestCase( unittest.TestCase ):
         o = self.g.get_organization( "ooo" )
         u.get_organization_events( o )
 
+    def testMergePullRequest( self ):
+        self.requester.expect.dataRequest( "GET", "/user", None, None ).andReturn( { "login": "xxx" } )
+        self.requester.expect.dataRequest( "GET", "/repos/xxx/yyy", None, None ).andReturn( { "name": "yyy", "owner": { "login": "xxx" } } )
+        self.requester.expect.dataRequest( "GET", "/repos/xxx/yyy/pulls/42", None, None ).andReturn( { "number": 42 } )
+        self.requester.expect.statusRequest( "GET", "/repos/xxx/yyy/pulls/42/merge", None, None ).andReturn( 404 )
+        self.requester.expect.statusRequest( "PUT", "/repos/xxx/yyy/pulls/42/merge", None, {} ).andReturn( 204 )
+        self.requester.expect.statusRequest( "GET", "/repos/xxx/yyy/pulls/42/merge", None, None ).andReturn( 204 )
+        p = self.g.get_user().get_repo( "yyy" ).get_pull( 42 )
+        self.assertFalse( p.is_merged() )
+        p.merge()
+        self.assertTrue( p.is_merged() )
+
 unittest.main()

github/GithubObjects.py

@@ -423,6 +423,10 @@ PullRequestComment = GithubObject(
     Deletable(),
 )
 
+def __pullRequestIsMerged( r ):
+    return r._github._statusRequest( "GET", r._baseUrl + "/merge", None, None ) == 204
+def __mergePullRequest( r, **data ):
+    r._github._statusRequest( "PUT", r._baseUrl + "/merge", None, data )
 PullRequest = GithubObject(
     "PullRequest",
     BaseUrl( lambda obj: obj._repo._baseUrl + "/pulls/" + str( obj.number ) ),
@@ -447,6 +451,8 @@ PullRequest = GithubObject(
         ElementGetable( [ "id" ], [], __modifyAttributesForObjectsReferingReferedRepo ),
         ElementCreatable( [ "body", "commit_id", "path", "position" ], [], __modifyAttributesForObjectsReferingReferedRepo ),
     ),
+    MethodFromCallable( "is_merged", [], [], __pullRequestIsMerged, SimpleTypePolicy( "bool" ) ),
+    MethodFromCallable( "merge", [], [ "commit_message" ], __mergePullRequest, SimpleTypePolicy( None ) ),
 )
 
 RepositoryKey = GithubObject(
@@ -588,7 +594,7 @@ Repository._addAttributePolicy( SeveralAttributePolicies( [
     ),
     ExternalListOfObjects( "pulls", "pull", PullRequest,
         ListGetable( [], [ "state" ], __modifyAttributesForObjectsReferingRepo ),
-        ElementGetable( [ "id" ], [], __modifyAttributesForObjectsReferingRepo ),
+        ElementGetable( [ "number" ], [], __modifyAttributesForObjectsReferingRepo ),
         ElementCreatable( [ "title", "body", "base", "head" ], [], __modifyAttributesForObjectsReferingRepo ),
     ),
 ] ) )