zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-03 03:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added unittests of MergingClient and fixed the return type to be Merge

Browse Source
This commit is contained in:
Lars Tabro Sørensen
2014-11-05 08:06:20 +01:00
parent 230d5d3aed
commit c44d38c594
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests/Octokit.Tests.csproj
+1
View File
@@ -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" />
Octokit/Clients/IMergingClient.cs
+1 -3
View File
@@ -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);
}
}
Octokit/Clients/MergingClient.cs
+7 -6
View File
@@ -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);
}
}
}
Octokit/Octokit-Mono.csproj
+1
View File
@@ -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" />
Octokit/Octokit-Portable.csproj
+1
View File
@@ -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" />
Octokit/Octokit-netcore45.csproj
+1
View File
@@ -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" />
Octokit/Octokit.csproj
+1
View File
@@ -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" />