From 3acdb3e38ca20ec81459f83fd4afec8e5b0e40be Mon Sep 17 00:00:00 2001 From: Matthias Langhard Date: Thu, 4 Nov 2021 11:50:02 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20fixes=20missing=20'v'=20prefix.=20Sorry?= =?UTF-8?q?=20m=C3=A4ge,=20force=20of=20habit=20:P?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cli/Cli.csproj | 2 +- src/Core/Models/Version.cs | 1 + .../GetVersionInformationFromRepoTests.cs | 2 +- .../VersionInformationTests.cs | 16 ++++---- tests/update-tag.tests/VersionTests.cs | 38 +++++++++---------- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/Cli/Cli.csproj b/src/Cli/Cli.csproj index 188e877..774958b 100644 --- a/src/Cli/Cli.csproj +++ b/src/Cli/Cli.csproj @@ -9,7 +9,7 @@ Novaloop.UpdateTag Updates the tag of a repo to the next chosen version according the semver symantic. semver;update-tag;tag;git - 0.2.1 + 0.3.0 Matthias Langhard Novaloop AG https://gitlab.com/novaloop-oss/novaloop.update-tag diff --git a/src/Core/Models/Version.cs b/src/Core/Models/Version.cs index 00da579..f7ee780 100644 --- a/src/Core/Models/Version.cs +++ b/src/Core/Models/Version.cs @@ -63,6 +63,7 @@ namespace Application.Models public override string ToString() { var sb = new StringBuilder(); + sb.Append('v'); sb.Append(Major); sb.Append('.'); sb.Append(Minor); diff --git a/tests/update-tag.tests/GetVersionInformationFromRepoTests.cs b/tests/update-tag.tests/GetVersionInformationFromRepoTests.cs index c2e661e..f153d02 100644 --- a/tests/update-tag.tests/GetVersionInformationFromRepoTests.cs +++ b/tests/update-tag.tests/GetVersionInformationFromRepoTests.cs @@ -33,7 +33,7 @@ namespace UpdateTag.Tests var versionInformation = await handler.Handle(query, CancellationToken.None); // Assert - Assert.Equal("0.2.0", versionInformation.CurrentVersion.ToString()); + Assert.Equal("v0.2.0", versionInformation.CurrentVersion.ToString()); } } } \ No newline at end of file diff --git a/tests/update-tag.tests/VersionInformationTests.cs b/tests/update-tag.tests/VersionInformationTests.cs index e48e9a1..4c546e5 100644 --- a/tests/update-tag.tests/VersionInformationTests.cs +++ b/tests/update-tag.tests/VersionInformationTests.cs @@ -18,8 +18,8 @@ namespace UpdateTag.Tests var versions = versionInformation.NextVersions.Select(nv => nv.Version.ToString()).ToList(); // Assert - Assert.Contains("1.0.1-RC.2", versions); // next rc - Assert.Contains("1.0.1", versions); // release rc + Assert.Contains("v1.0.1-RC.2", versions); // next rc + Assert.Contains("v1.0.1", versions); // release rc Assert.Equal(2, versions.Count); } @@ -36,12 +36,12 @@ namespace UpdateTag.Tests // Assert - Assert.Contains("1.0.2-RC.0", versions); // patch RC - Assert.Contains("1.1.0-RC.0", versions); // minor RC - Assert.Contains("2.0.0-RC.0", versions); // major RC - Assert.Contains("1.0.2", versions); // next patch - Assert.Contains("1.1.0", versions); // next minor - Assert.Contains("2.0.0", versions); // next major + Assert.Contains("v1.0.2-RC.0", versions); // patch RC + Assert.Contains("v1.1.0-RC.0", versions); // minor RC + Assert.Contains("v2.0.0-RC.0", versions); // major RC + Assert.Contains("v1.0.2", versions); // next patch + Assert.Contains("v1.1.0", versions); // next minor + Assert.Contains("v2.0.0", versions); // next major Assert.Equal(6, versions.Count); } } diff --git a/tests/update-tag.tests/VersionTests.cs b/tests/update-tag.tests/VersionTests.cs index 49f8250..8b72bb4 100644 --- a/tests/update-tag.tests/VersionTests.cs +++ b/tests/update-tag.tests/VersionTests.cs @@ -6,9 +6,9 @@ namespace UpdateTag.Tests public class VersionTests { [Theory] - [InlineData(1, 0, 0, "", "", "2.0.0")] - [InlineData(1, 1, 0, "", "", "2.0.0")] - [InlineData(1, 1, 1, "", "", "2.0.0")] + [InlineData(1, 0, 0, "", "", "v2.0.0")] + [InlineData(1, 1, 0, "", "", "v2.0.0")] + [InlineData(1, 1, 1, "", "", "v2.0.0")] public void NextMajor(int major, int minor, int patch, string rc, string service, string expected) { @@ -18,9 +18,9 @@ namespace UpdateTag.Tests [Theory] - [InlineData(1, 0, 0, "", "", "1.1.0")] - [InlineData(1, 1, 0, "", "", "1.2.0")] - [InlineData(1, 1, 1, "", "", "1.2.0")] + [InlineData(1, 0, 0, "", "", "v1.1.0")] + [InlineData(1, 1, 0, "", "", "v1.2.0")] + [InlineData(1, 1, 1, "", "", "v1.2.0")] public void NextMinor(int major, int minor, int patch, string rc, string service, string expected) { @@ -29,9 +29,9 @@ namespace UpdateTag.Tests } [Theory] - [InlineData(1, 0, 0, "", "", "1.0.1")] - [InlineData(1, 1, 0, "", "", "1.1.1")] - [InlineData(1, 1, 1, "", "", "1.1.2")] + [InlineData(1, 0, 0, "", "", "v1.0.1")] + [InlineData(1, 1, 0, "", "", "v1.1.1")] + [InlineData(1, 1, 1, "", "", "v1.1.2")] public void NextPatch(int major, int minor, int patch, string rc, string service, string expected) { @@ -40,8 +40,8 @@ namespace UpdateTag.Tests } [Theory] - [InlineData(1, 1, 1, "RC.4", "", "1.1.1-RC.5")] - [InlineData(1, 1, 1, "RC.4", "ErpNext", "1.1.1-RC.5+ErpNext")] + [InlineData(1, 1, 1, "RC.4", "", "v1.1.1-RC.5")] + [InlineData(1, 1, 1, "RC.4", "ErpNext", "v1.1.1-RC.5+ErpNext")] public void NextRc(int major, int minor, int patch, string rc, string service, string expected) { @@ -50,8 +50,8 @@ namespace UpdateTag.Tests } [Theory] - [InlineData(1, 1, 1, null, "", "1.1.2-RC.0")] - [InlineData(1, 1, 1, null, "ErpNext", "1.1.2-RC.0+ErpNext")] + [InlineData(1, 1, 1, null, "", "v1.1.2-RC.0")] + [InlineData(1, 1, 1, null, "ErpNext", "v1.1.2-RC.0+ErpNext")] public void CreatePatchRc(int major, int minor, int patch, string rc, string service, string expected) { var version = new Version(major, minor, patch, rc, service).CreatePatchRc(); @@ -59,8 +59,8 @@ namespace UpdateTag.Tests } [Theory] - [InlineData(1, 1, 1, null, "", "1.2.0-RC.0")] - [InlineData(1, 1, 1, null, "ErpNext", "1.2.0-RC.0+ErpNext")] + [InlineData(1, 1, 1, null, "", "v1.2.0-RC.0")] + [InlineData(1, 1, 1, null, "ErpNext", "v1.2.0-RC.0+ErpNext")] public void CreateMinorRc(int major, int minor, int patch, string rc, string service, string expected) { var version = new Version(major, minor, patch, rc, service).CreateMinorRc(); @@ -68,8 +68,8 @@ namespace UpdateTag.Tests } [Theory] - [InlineData(1, 1, 1, null, "", "2.0.0-RC.0")] - [InlineData(1, 1, 1, null, "ErpNext", "2.0.0-RC.0+ErpNext")] + [InlineData(1, 1, 1, null, "", "v2.0.0-RC.0")] + [InlineData(1, 1, 1, null, "ErpNext", "v2.0.0-RC.0+ErpNext")] public void CreateMajroRc(int major, int minor, int patch, string rc, string service, string expected) { var version = new Version(major, minor, patch, rc, service).CreateMajorRc(); @@ -77,8 +77,8 @@ namespace UpdateTag.Tests } [Theory] - [InlineData(1, 1, 1, "RC.4", "", "1.1.1")] - [InlineData(1, 1, 1, "RC.4", "ErpNext", "1.1.1+ErpNext")] + [InlineData(1, 1, 1, "RC.4", "", "v1.1.1")] + [InlineData(1, 1, 1, "RC.4", "ErpNext", "v1.1.1+ErpNext")] public void ReleaseRc(int major, int minor, int patch, string rc, string service, string expected) { var version = new Version(major, minor, patch, rc, service).ReleaseRc();