From c44d38c594f8a5ab2e254e717c8c92ebb65f2654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Tabro=20S=C3=B8rensen?= <lsrensen@ebay.com>
Date: Wed, 5 Nov 2014 08:06:20 +0100
Subject: [PATCH] Added unittests of MergingClient and fixed the return type to
 be Merge

---
 Octokit.Tests/Octokit.Tests.csproj |  1 +
 Octokit/Clients/IMergingClient.cs  |  4 +---
 Octokit/Clients/MergingClient.cs   | 13 +++++++------
 Octokit/Octokit-Mono.csproj        |  1 +
 Octokit/Octokit-Portable.csproj    |  1 +
 Octokit/Octokit-netcore45.csproj   |  1 +
 Octokit/Octokit.csproj             |  1 +
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj
index 89a7ff81..7b7ecb30 100644
--- a/Octokit.Tests/Octokit.Tests.csproj
+++ b/Octokit.Tests/Octokit.Tests.csproj
@@ -65,6 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Authentication\CredentialsTests.cs" />
+    <Compile Include="Clients\MargeClientTests.cs" />
     <Compile Include="Clients\OauthClientTests.cs" />
     <Compile Include="Clients\RepositoryCommentsClientTests.cs" />
     <Compile Include="Clients\DeploymentsClientTests.cs" />
diff --git a/Octokit/Clients/IMergingClient.cs b/Octokit/Clients/IMergingClient.cs
index 3b0e51cf..2873ddf1 100644
--- a/Octokit/Clients/IMergingClient.cs
+++ b/Octokit/Clients/IMergingClient.cs
@@ -18,10 +18,8 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="baseBranch">The name of the base branch that the head will be merged into</param>
-        /// <param name="head">The head to merge. This can be a branch name or a commit SHA1</param>
         /// <param name="merge">The merge to create</param>
         /// <returns></returns>
-        Task<Commit> Create(string owner, string name, string baseBranch, string head, NewMerge merge);
+        Task<Merge> Create(string owner, string name, NewMerge merge);
     }
 }
\ No newline at end of file
diff --git a/Octokit/Clients/MergingClient.cs b/Octokit/Clients/MergingClient.cs
index 5f5b16bb..18cec60a 100644
--- a/Octokit/Clients/MergingClient.cs
+++ b/Octokit/Clients/MergingClient.cs
@@ -22,16 +22,17 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="baseBranch">The name of the base branch that the head will be merged into</param>
-        /// <param name="head">The head to merge. This can be a branch name or a commit SHA1</param>
         /// <param name="merge">The merge to create</param>
         /// <returns></returns>
-        public Task<Commit> Create(string owner, string name, string baseBranch, string head, NewMerge merge)
+        public Task<Merge> Create(string owner, string name, NewMerge merge)
         {
-            Ensure.ArgumentNotNullOrEmptyString(baseBranch, "baseBranch");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
+            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNull(merge, "merge");
+            Ensure.ArgumentNotNullOrEmptyString(merge.Base, "baseBranch");
+            Ensure.ArgumentNotNullOrEmptyString(merge.Head, "head");
             
-            return ApiConnection.Post<Commit>(ApiUrls.CreateMerge(owner, name), merge);
+            return ApiConnection.Post<Merge>(ApiUrls.CreateMerge(owner, name), merge);
         }
     }
 }
\ No newline at end of file
diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj
index 491c73f1..c54fd77d 100644
--- a/Octokit/Octokit-Mono.csproj
+++ b/Octokit/Octokit-Mono.csproj
@@ -141,6 +141,7 @@
     <Compile Include="Models\Response\IssueComment.cs" />
     <Compile Include="Models\Response\IssueEvent.cs" />
     <Compile Include="Models\Response\Label.cs" />
+    <Compile Include="Models\Response\Merge.cs" />
     <Compile Include="Models\Response\Milestone.cs" />
     <Compile Include="Models\Request\NewIssue.cs" />
     <Compile Include="Models\Response\Notification.cs" />
diff --git a/Octokit/Octokit-Portable.csproj b/Octokit/Octokit-Portable.csproj
index a2e7917d..16c0f597 100644
--- a/Octokit/Octokit-Portable.csproj
+++ b/Octokit/Octokit-Portable.csproj
@@ -231,6 +231,7 @@
     <Compile Include="Models\Response\IssueComment.cs" />
     <Compile Include="Models\Response\IssueEvent.cs" />
     <Compile Include="Models\Response\Label.cs" />
+    <Compile Include="Models\Response\Merge.cs" />
     <Compile Include="Models\Response\Milestone.cs" />
     <Compile Include="Models\Response\Notification.cs" />
     <Compile Include="Models\Response\NotificationInfo.cs" />
diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj
index bb0604ed..69529561 100644
--- a/Octokit/Octokit-netcore45.csproj
+++ b/Octokit/Octokit-netcore45.csproj
@@ -238,6 +238,7 @@
     <Compile Include="Models\Response\IssueComment.cs" />
     <Compile Include="Models\Response\IssueEvent.cs" />
     <Compile Include="Models\Response\Label.cs" />
+    <Compile Include="Models\Response\Merge.cs" />
     <Compile Include="Models\Response\Milestone.cs" />
     <Compile Include="Models\Response\Notification.cs" />
     <Compile Include="Models\Response\NotificationInfo.cs" />
diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
index 3519e7f8..8e9beb40 100644
--- a/Octokit/Octokit.csproj
+++ b/Octokit/Octokit.csproj
@@ -80,6 +80,7 @@
     <Compile Include="Models\Request\NewDeployKey.cs" />
     <Compile Include="Models\Request\PublicKey.cs" />
     <Compile Include="Models\Request\CommitRequest.cs" />
+    <Compile Include="Models\Response\Merge.cs" />
     <Compile Include="Models\Response\RepositoryPermissions.cs" />
     <Compile Include="Models\Response\DeployKey.cs" />
     <Compile Include="Models\Request\OauthLoginRequest.cs" />