mirror of
https://github.com/zoriya/octokit.net.git
synced 2026-06-04 03:16:11 +00:00
Rename Message to CommitMessage
According to the docs (https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button), this should be sent as "commit_message" thus we need to name it `CommitMessage` Fixes #913
This commit is contained in:
@@ -194,7 +194,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 { Message = "thing the thing" };
|
||||
var merge = new MergePullRequest { CommitMessage = "thing the thing" };
|
||||
var result = await _fixture.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);
|
||||
|
||||
Assert.True(result.Merged);
|
||||
@@ -221,7 +221,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 { Message = "thing the thing", Sha = pullRequest.Head.Sha };
|
||||
var merge = new MergePullRequest { CommitMessage = "thing the thing", Sha = pullRequest.Head.Sha };
|
||||
var result = await _fixture.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);
|
||||
|
||||
Assert.True(result.Merged);
|
||||
@@ -250,7 +250,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 { Message = "thing the thing" };
|
||||
var merge = new MergePullRequest { CommitMessage = "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");
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using NSubstitute;
|
||||
using Octokit.Tests.Helpers;
|
||||
using Xunit;
|
||||
|
||||
namespace Octokit.Tests.Clients
|
||||
@@ -140,7 +139,7 @@ namespace Octokit.Tests.Clients
|
||||
[Fact]
|
||||
public void PutsToCorrectUrl()
|
||||
{
|
||||
var mergePullRequest = new MergePullRequest { Message = "fake commit message" };
|
||||
var mergePullRequest = new MergePullRequest { CommitMessage = "fake commit message" };
|
||||
var connection = Substitute.For<IApiConnection>();
|
||||
var client = new PullRequestsClient(connection);
|
||||
|
||||
@@ -157,9 +156,9 @@ namespace Octokit.Tests.Clients
|
||||
var client = new PullRequestsClient(connection);
|
||||
|
||||
await Assert.ThrowsAsync<ArgumentNullException>(() =>
|
||||
client.Merge(null, "name", 42, new MergePullRequest { Message = "message" }));
|
||||
client.Merge(null, "name", 42, new MergePullRequest { CommitMessage = "message" }));
|
||||
await Assert.ThrowsAsync<ArgumentNullException>(() =>
|
||||
client.Merge("owner", null, 42, new MergePullRequest { Message = "message" }));
|
||||
client.Merge("owner", null, 42, new MergePullRequest { CommitMessage = "message" }));
|
||||
await Assert.ThrowsAsync<ArgumentNullException>(() =>
|
||||
client.Merge("owner", "name", 42, null));
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ namespace Octokit.Tests.Reactive
|
||||
[Fact]
|
||||
public void MergesPullRequest()
|
||||
{
|
||||
var mergePullRequest = new MergePullRequest { Message = "fake commit message" };
|
||||
var mergePullRequest = new MergePullRequest { CommitMessage = "fake commit message" };
|
||||
var gitHubClient = Substitute.For<IGitHubClient>();
|
||||
var client = new ObservablePullRequestsClient(gitHubClient);
|
||||
|
||||
@@ -241,9 +241,9 @@ namespace Octokit.Tests.Reactive
|
||||
var client = new PullRequestsClient(connection);
|
||||
|
||||
await Assert.ThrowsAsync<ArgumentNullException>(() =>
|
||||
client.Merge(null, "name", 42, new MergePullRequest { Message = "message" }));
|
||||
client.Merge(null, "name", 42, new MergePullRequest { CommitMessage = "message" }));
|
||||
await Assert.ThrowsAsync<ArgumentNullException>(() =>
|
||||
client.Merge("owner", null, 42, new MergePullRequest { Message = "message" }));
|
||||
client.Merge("owner", null, 42, new MergePullRequest { CommitMessage = "message" }));
|
||||
await Assert.ThrowsAsync<ArgumentNullException>(() =>
|
||||
client.Merge("owner", "name", 42, null));
|
||||
}
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
|
||||
using System;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
|
||||
namespace Octokit
|
||||
{
|
||||
/// <summary>
|
||||
/// Used to merge a pull request.
|
||||
/// Used to merge a pull request (Merge Button).
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
|
||||
/// </remarks>
|
||||
[DebuggerDisplay("{DebuggerDisplay,nq}")]
|
||||
public class MergePullRequest
|
||||
{
|
||||
/// <summary>
|
||||
/// The message that will be used for the merge commit (optional)
|
||||
/// </summary>
|
||||
public string Message { get; set; }
|
||||
public string CommitMessage { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// The SHA that pull request head must match to allow merge (optional)
|
||||
@@ -25,7 +27,7 @@ namespace Octokit
|
||||
{
|
||||
get
|
||||
{
|
||||
return String.Format(CultureInfo.InvariantCulture, "Message: '{0}', Sha: '{1}'", Message, Sha);
|
||||
return String.Format(CultureInfo.InvariantCulture, "Message: '{0}', Sha: '{1}'", CommitMessage, Sha);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user