From 1a36dfab594ba0fa651d3d478db57788f2490611 Mon Sep 17 00:00:00 2001
From: Brendan Forster <brendan@github.com>
Date: Tue, 18 Feb 2014 16:50:26 +1100
Subject: [PATCH] test that master reflects our merge commit found

---
 .../Clients/PullRequestsClientTests.cs         | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
index 32c3ef45..bd4368ca 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
@@ -54,6 +54,7 @@ public class PullRequestsClientTests : IDisposable
         var result = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
 
         Assert.Equal("a pull request", result.Title);
+        Assert.False(result.Merged);
     }
 
     [IntegrationTest]
@@ -87,7 +88,6 @@ public class PullRequestsClientTests : IDisposable
         Assert.Equal(pullRequest.Body, result.Body);
     }
 
-
     [IntegrationTest]
     public async Task IsNotMergedInitially()
     {
@@ -101,7 +101,6 @@ public class PullRequestsClientTests : IDisposable
         Assert.False(result);
     }
 
-
     [IntegrationTest]
     public async Task CanBeMerged()
     {
@@ -116,6 +115,21 @@ public class PullRequestsClientTests : IDisposable
         Assert.True(result.Merged);
     }
 
+    [IntegrationTest]
+    public async Task UpdatesMaster()
+    {
+        await CreateTheWorld();
+
+        var newPullRequest = new NewPullRequest("a pull request", "my-branch", "master");
+        var pullRequest = await _pullRequestsClient.Create(Helper.UserName, _repository.Name, newPullRequest);
+
+        var merge = new MergePullRequest("thing the thing");
+        var result = await _pullRequestsClient.Merge(Helper.UserName, _repository.Name, pullRequest.Number, merge);
+
+        var master = await _client.GitDatabase.Reference.Get(Helper.UserName, _repository.Name, "heads/master");
+
+        Assert.Equal(result.Sha, master.Object.Sha);
+    }
 
     async Task<TreeResponse> CreateTree(IDictionary<string,string> treeContents)
     {