From a2f3de45b8422bb5a20ac029326b9623bf766375 Mon Sep 17 00:00:00 2001
From: Josh Sullivan <jaysche.sullivan@gmail.com>
Date: Tue, 12 Nov 2013 00:56:21 -0500
Subject: [PATCH] Added tests for the Merge method

---
 .../Clients/PullRequestsClientTests.cs        | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Octokit.Tests/Clients/PullRequestsClientTests.cs b/Octokit.Tests/Clients/PullRequestsClientTests.cs
index 4a81fe96..5f589808 100644
--- a/Octokit.Tests/Clients/PullRequestsClientTests.cs
+++ b/Octokit.Tests/Clients/PullRequestsClientTests.cs
@@ -134,6 +134,36 @@ namespace Octokit.Tests.Clients
             }
         }
 
+        public class TheMergeMethod 
+        {
+            [Fact]
+            public void PutsToCorrectUrl() 
+            {
+                var mergePullRequest = new MergePullRequest("fake commit message");
+                var connection = Substitute.For<IApiConnection>();
+                var client = new PullRequestsClient(connection);
+
+                client.Merge("fake", "repo", 42, mergePullRequest);
+
+                connection.Received().Put<PullRequestMerge>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/pulls/42"),
+                    mergePullRequest);
+            }
+
+            [Fact]
+            public async Task EnsuresArgumentsNotNull()
+            {
+                var connection = Substitute.For<IApiConnection>();
+                var client = new PullRequestsClient(connection);
+
+                AssertEx.Throws<ArgumentNullException>(async () => await
+                    client.Merge(null, "name", 42, new MergePullRequest("message")));
+                AssertEx.Throws<ArgumentException>(async () => await
+                    client.Merge("owner", null, 42, new MergePullRequest("message")));
+                AssertEx.Throws<ArgumentNullException>(async () => await
+                    client.Merge("owner", "name", 42, null));
+            }
+        }
+
         public class TheCtor
         {
             [Fact]