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

Add SHA and make message optional

Browse Source
This commit is contained in:
Henrik Andersson
2015-05-19 07:53:01 +10:00
parent bef91f76bb
commit d8cef691b7
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
+2 -2
View File
@@ -193,7 +193,7 @@ public class PullRequestsClientTests : IDisposable
var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);
var merge = new MergePullRequest("thing the thing");
var merge = new MergePullRequest { Message = "thing the thing" };
var result = await _fixture.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);
Assert.True(result.Merged);
@@ -207,7 +207,7 @@ public class PullRequestsClientTests : IDisposable
var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
var pullRequest = await _fixture.Create(Helper.UserName, _repository.Name, newPullRequest);
var merge = new MergePullRequest("thing the thing");
var merge = new MergePullRequest { Message = "thing the thing" };
var result = await _fixture.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);
var master = await _client.GitDatabase.Reference.Get(Helper.UserName, _repository.Name, "heads/master");
Octokit.Tests/Clients/PullRequestsClientTests.cs
+4 -4
View File
@@ -138,9 +138,9 @@ namespace Octokit.Tests.Clients
public class TheMergeMethod
{
[Fact]
public void PutsToCorrectUrl()
public void PutsToCorrectUrl()
{
var mergePullRequest = new MergePullRequest("fake commit message");
var mergePullRequest = new MergePullRequest { Message = "fake commit message" };
var connection = Substitute.For<IApiConnection>();
var client = new PullRequestsClient(connection);
@@ -157,9 +157,9 @@ namespace Octokit.Tests.Clients
var client = new PullRequestsClient(connection);
await AssertEx.Throws<ArgumentNullException>(() =>
client.Merge(null, "name", 42, new MergePullRequest("message")));
client.Merge(null, "name", 42, new MergePullRequest { Message = "message" }));
await AssertEx.Throws<ArgumentNullException>(() =>
client.Merge("owner", null, 42, new MergePullRequest("message")));
client.Merge("owner", null, 42, new MergePullRequest { Message = "message" }));
await AssertEx.Throws<ArgumentNullException>(() =>
client.Merge("owner", "name", 42, null));
}
Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs
+3 -3
View File
@@ -224,7 +224,7 @@ namespace Octokit.Tests.Reactive
[Fact]
public void MergesPullRequest()
{
var mergePullRequest = new MergePullRequest("fake commit message");
var mergePullRequest = new MergePullRequest { Message = "fake commit message" };
var gitHubClient = Substitute.For<IGitHubClient>();
var client = new ObservablePullRequestsClient(gitHubClient);
@@ -240,9 +240,9 @@ namespace Octokit.Tests.Reactive
var client = new PullRequestsClient(connection);
await AssertEx.Throws<ArgumentNullException>(async () => await
client.Merge(null, "name", 42, new MergePullRequest("message")));
client.Merge(null, "name", 42, new MergePullRequest { Message = "message" }));
await AssertEx.Throws<ArgumentNullException>(async () => await
client.Merge("owner", null, 42, new MergePullRequest("message")));
client.Merge("owner", null, 42, new MergePullRequest { Message = "message" }));
await AssertEx.Throws<ArgumentNullException>(async () => await
client.Merge("owner", "name", 42, null));
}
Octokit/Models/Request/MergePullRequest.cs
+7 -9
View File
@@ -11,23 +11,21 @@ namespace Octokit
[DebuggerDisplay("{DebuggerDisplay,nq}")]
public class MergePullRequest
{
public MergePullRequest(string message)
{
Ensure.ArgumentNotNull(message, "message");
Message = message;
}
/// <summary>
/// The message that will be used for the merge commit (optional)
/// </summary>
public string Message { get; private set; }
public string Message { get; set; }
/// <summary>
/// The SHA that pull request head must match to allow merge (optional)
/// </summary>
public string Sha { get; set; }
internal string DebuggerDisplay
{
get
{
return String.Format(CultureInfo.InvariantCulture, "Message: {0}", Message);
return String.Format(CultureInfo.InvariantCulture, "Message: '{0}', Sha: '{1}'", Message, Sha);
}
}
}