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(); + var client = new PullRequestsClient(connection); + + client.Merge("fake", "repo", 42, mergePullRequest); + + connection.Received().Put(Arg.Is(u => u.ToString() == "repos/fake/repo/pulls/42"), + mergePullRequest); + } + + [Fact] + public async Task EnsuresArgumentsNotNull() + { + var connection = Substitute.For(); + var client = new PullRequestsClient(connection); + + AssertEx.Throws(async () => await + client.Merge(null, "name", 42, new MergePullRequest("message"))); + AssertEx.Throws(async () => await + client.Merge("owner", null, 42, new MergePullRequest("message"))); + AssertEx.Throws(async () => await + client.Merge("owner", "name", 42, null)); + } + } + public class TheCtor { [Fact]