Fixed failing tests

Author: JakeGinnivan

GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -5,7 +5,7 @@ namespace GitVersionCore.Tests
     public class TestEffectiveConfiguration : EffectiveConfiguration
     {
         public TestEffectiveConfiguration(
-            AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchMetadata, 
+            AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch, 
             VersioningMode versioningMode = VersioningMode.ContinuousDelivery, 
             string gitTagPrefix = "v", 
             string tag = "",

GitVersionCore/Configuration/Config.cs

@@ -12,13 +12,13 @@ public Config()
         {
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch;
             TagPrefix = "[vV]";
-            VersioningMode = VersioningMode.ContinuousDelivery;
+            VersioningMode = GitVersion.VersioningMode.ContinuousDelivery;
             Branches["release[/-]"] = new BranchConfig { Tag = "beta" };
             Branches["hotfix[/-]"] = new BranchConfig { Tag = "beta" };
             Branches["develop"] = new BranchConfig
             {
                 Tag = "unstable",
-                VersioningMode = VersioningMode.ContinuousDeployment
+                VersioningMode = GitVersion.VersioningMode.ContinuousDeployment
             };
         }
 

GitVersionCore/GitVersionContext.cs

@@ -26,7 +26,7 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
             IsContextForTrackedBranchesOnly = isForTrackingBranchOnly;
 
             if (currentBranch == null)
-                return;
+                throw new InvalidOperationException("Need a branch to operate on");
 
             CurrentCommit = currentBranch.Tip;
 

GitVersionTask.Tests/UpdateAssemblyInfoTests.cs

@@ -101,22 +101,6 @@ public void StandardExecutionMode_CanAcceptAssemblyVersioningSchemes(string asse
         task.InnerExecute();
     }
 
-    [Test]
-    public void StandardExecutionMode_ThrowsUponUnexpectedAssemblyVersioningSchemes()
-    {
-        var repoPath = CheckoutLocal(ASBMTestRepoWorkingDirPath, "refs/heads/master");
-
-        var task = new UpdateAssemblyInfo
-        {
-            BuildEngine = new MockBuildEngine(),
-            SolutionDirectory = repoPath,
-            // TODO AssemblyVersioningScheme = "Boom"
-        };
-
-        var exception = Assert.Throws<WarningException>(() => task.InnerExecute());
-        Assert.AreEqual("Unexpected assembly versioning scheme 'Boom'.", exception.Message);
-    }
-
     [SetUp]
     public void SetUp()
     {

GitVersionTask.Tests/VersionOnMasterFinderTests.cs

@@ -19,31 +19,32 @@ public void Should_find_previous_commit_that_was_at_least_a_minor_bump()
 
         const string sha = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef";
 
+        var mockBranch = new MockBranch("master")
+        {
+            new MockMergeCommit(new ObjectId(sha))
+            {
+                MessageEx = "Merge branch 'hotfix-0.3.0'",
+                CommitterEx = signature
+            },
+            new MockMergeCommit
+            {
+                MessageEx = "Merge branch 'hotfix-0.3.1'",
+                CommitterEx = signature,
+            },
+            new MockMergeCommit
+            {
+                MessageEx = "Merge branch 'hotfix-0.2.0'",
+                CommitterEx = signature
+            },
+        };
         var repository = new MockRepository
         {
             Branches = new MockBranchCollection
                 {
-                    new MockBranch("master")
-                    {
-                        new MockMergeCommit(new ObjectId(sha))
-                        {
-                            MessageEx = "Merge branch 'hotfix-0.3.0'",
-                            CommitterEx = signature
-                        },
-                        new MockMergeCommit
-                        {
-                            MessageEx = "Merge branch 'hotfix-0.3.1'",
-                            CommitterEx = signature,
-                        },
-                        new MockMergeCommit
-                        {
-                            MessageEx = "Merge branch 'hotfix-0.2.0'",
-                            CommitterEx = signature
-                        },
-                    },
+                    mockBranch,
                 }
         };
-        var version = finder.Execute(new GitVersionContext(repository, null, new Config()), 1.Seconds().Ago());
+        var version = finder.Execute(new GitVersionContext(repository, mockBranch, new Config()), 1.Seconds().Ago());
         ObjectApprover.VerifyWithJson(version);
     }
 }