Made it easy to test Pull requests and verified #281 is fixed

Author: JakeGinnivan

GitVersionCore.Tests/Helpers/GitTestExtensions.cs

@@ -78,4 +78,21 @@ public static Tag MakeATaggedCommit(this IRepository repository, string tag)
             return existingTag;
         return repository.Tags.Add(tag, commit);
     }
+
+    public static Branch CreatePullRequest(this IRepository repository, string from, string to, int prNumber = 2, bool isRemotePr = true)
+    {
+        repository.Checkout(to);
+        repository.MergeNoFF(from);
+        repository.CreateBranch("pull/" + prNumber + "/merge").Checkout();
+        repository.Checkout(to);
+        repository.Reset(ResetMode.Hard, "HEAD~1");
+        var pullBranch = repository.Checkout("pull/" + prNumber + "/merge");
+        if (isRemotePr)
+        {
+            // If we delete the branch, it is effectively the same as remote PR
+            repository.Branches.Remove(from);
+        }
+
+        return pullBranch;
+    }
 }

GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -67,6 +67,9 @@ public void PatchOlderReleaseExample()
             fixture.AssertFullSemver("1.1.1-fix.1+1");
             fixture.Repository.MakeACommit();
             fixture.AssertFullSemver("1.1.1-fix.1+2");
+
+            fixture.Repository.CreatePullRequest("feature/fix", "hotfix-1.1.1", isRemotePr: false);
+            fixture.AssertFullSemver("1.1.1-PullRequest.2+3");
             fixture.Repository.Checkout("hotfix-1.1.1");
             fixture.Repository.MergeNoFF("feature/fix", Constants.SignatureNow());
             fixture.AssertFullSemver("1.1.1-beta.1+1");

GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs

@@ -13,13 +13,8 @@ public void CanCalculatePullRequestChanges()
             fixture.Repository.MakeATaggedCommit("0.1.0");
             fixture.Repository.CreateBranch("feature/Foo").Checkout();
             fixture.Repository.MakeACommit();
-
-            fixture.Repository.Checkout("master");
-            fixture.Repository.MergeNoFF("feature/Foo");
-            fixture.Repository.CreateBranch("pull/2/merge").Checkout();
-            fixture.Repository.Checkout("master");
-            fixture.Repository.Reset(ResetMode.Hard, "HEAD~1");
-            fixture.Repository.Checkout("pull/2/merge");
+            
+            fixture.Repository.CreatePullRequest("feature/Foo", "master");
 
             fixture.DumpGraph();
             fixture.AssertFullSemver("0.1.1-PullRequest.2+2");
@@ -37,12 +32,7 @@ public void CanCalculatePullRequestChangesInheritingConfig()
             fixture.Repository.CreateBranch("feature/Foo").Checkout();
             fixture.Repository.MakeACommit();
 
-            fixture.Repository.Checkout("develop");
-            fixture.Repository.MergeNoFF("feature/Foo");
-            fixture.Repository.CreateBranch("pull/44/merge").Checkout();
-            fixture.Repository.Checkout("develop");
-            fixture.Repository.Reset(ResetMode.Hard, "HEAD~1");
-            fixture.Repository.Checkout("pull/44/merge");
+            fixture.Repository.CreatePullRequest("feature/Foo", "develop", 44);
 
             fixture.DumpGraph();
             fixture.AssertFullSemver("0.2.0-PullRequest.44+3");
@@ -58,14 +48,8 @@ public void CanCalculatePullRequestChangesFromRemoteRepo()
             fixture.Repository.CreateBranch("feature/Foo").Checkout();
             fixture.Repository.MakeACommit();
 
-            fixture.Repository.Checkout("master");
-            fixture.Repository.MergeNoFF("feature/Foo");
-            fixture.Repository.CreateBranch("pull/2/merge").Checkout();
-            fixture.Repository.Checkout("master");
-            fixture.Repository.Reset(ResetMode.Hard, "HEAD~1");
-            fixture.Repository.Checkout("pull/2/merge");
-            // If we delete the branch, it is effectively the same as remote PR
-            fixture.Repository.Branches.Remove("feature/Foo");
+
+            fixture.Repository.CreatePullRequest("feature/Foo", "master");
 
             fixture.DumpGraph();
             fixture.AssertFullSemver("0.1.1-PullRequest.2+2");
@@ -83,14 +67,7 @@ public void CanCalculatePullRequestChangesInheritingConfigFromRemoteRepo()
             fixture.Repository.CreateBranch("feature/Foo").Checkout();
             fixture.Repository.MakeACommit();
 
-            fixture.Repository.Checkout("develop");
-            fixture.Repository.MergeNoFF("feature/Foo");
-            fixture.Repository.CreateBranch("pull/2/merge").Checkout();
-            fixture.Repository.Checkout("develop");
-            fixture.Repository.Reset(ResetMode.Hard, "HEAD~1");
-            fixture.Repository.Checkout("pull/2/merge");
-            // If we delete the branch, it is effectively the same as remote PR
-            fixture.Repository.Branches.Remove("feature/Foo");
+            fixture.Repository.CreatePullRequest("feature/Foo", "develop");
 
             fixture.AssertFullSemver("0.2.0-PullRequest.2+3");
         }