Awaiting result of pull request merge so that we can catch the exception, fixed integration test by making pull request un mergeable

This commit is contained in:
Gabriel Weyer
2015-12-14 22:37:12 +11:00
parent 067a5d26e2
commit 74cb2b2b90
2 changed files with 4 additions and 3 deletions
@@ -246,7 +246,8 @@ public class PullRequestsClientTests : IDisposable
var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
var newMasterTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World, we meet again!" } });
await CreateCommit("baseline for pull request", newMasterTree.Sha, master.Object.Sha);
var masterCommit = await CreateCommit("Commit in master", newMasterTree.Sha, master.Object.Sha);
await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(masterCommit.Sha));
var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);