From dc504a228d86e0d2b480f2e5147215c19cd1b5f5 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Mon, 14 Dec 2015 10:49:59 +1030 Subject: [PATCH] ensure the branch is not actually mergeable --- .../Clients/PullRequestsClientTests.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs index 8c271f0d..c7594323 100644 --- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs @@ -251,6 +251,12 @@ public class PullRequestsClientTests : IDisposable var newPullRequest = new NewPullRequest("a pull request", branchName, "master"); var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest); + await Task.Delay(TimeSpan.FromSeconds(5)); + + var updatedPullRequest = await _fixture.Get(Helper.UserName, _context.RepositoryName, pullRequest.Number); + + Assert.False(updatedPullRequest.Mergeable); + var merge = new MergePullRequest { Sha = pullRequest.Head.Sha }; var ex = await Assert.ThrowsAsync(() => _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge));