Skip to content

Commit 8d1e896

Browse files
robertcoltheartarturcic
authored andcommitted
fix: move branch name duplication to const
1 parent b762c23 commit 8d1e896

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

src/GitVersion.Configuration.Tests/Configuration/ConfigurationExtensionsTests.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ namespace GitVersion.Configuration.Tests;
66
[TestFixture]
77
public class ConfigurationExtensionsTests : TestBase
88
{
9+
private const string BranchName = "pull-request";
10+
911
[TestCase("release/2.0.0",
1012
"refs/heads/release/2.0.0", "release/2.0.0", "release/2.0.0",
1113
true, false, false, false, true)]
@@ -63,13 +65,13 @@ public void EnsureGetBranchSpecificLabelProcessesEnvironmentVariables()
6365

6466
var configuration = GitFlowConfigurationBuilder.New
6567
.WithoutBranches()
66-
.WithBranch("pull-request", builder => builder
68+
.WithBranch(BranchName, builder => builder
6769
.WithLabel("pr-{env:GITHUB_HEAD_REF}")
6870
.WithRegularExpression(@"^pull[/-]"))
6971
.Build();
7072

71-
var effectiveConfiguration = configuration.GetEffectiveConfiguration(ReferenceName.FromBranchName("pull-request"));
72-
var actual = effectiveConfiguration.GetBranchSpecificLabel(ReferenceName.FromBranchName("pull-request"), null, environment);
73+
var effectiveConfiguration = configuration.GetEffectiveConfiguration(ReferenceName.FromBranchName(BranchName));
74+
var actual = effectiveConfiguration.GetBranchSpecificLabel(ReferenceName.FromBranchName(BranchName), null, environment);
7375
actual.ShouldBe("pr-feature-branch");
7476
}
7577

@@ -81,13 +83,13 @@ public void EnsureGetBranchSpecificLabelProcessesEnvironmentVariablesWithFallbac
8183

8284
var configuration = GitFlowConfigurationBuilder.New
8385
.WithoutBranches()
84-
.WithBranch("pull-request", builder => builder
86+
.WithBranch(BranchName, builder => builder
8587
.WithLabel("pr-{env:GITHUB_HEAD_REF ?? \"unknown\"}")
8688
.WithRegularExpression(@"^pull[/-]"))
8789
.Build();
8890

89-
var effectiveConfiguration = configuration.GetEffectiveConfiguration(ReferenceName.FromBranchName("pull-request"));
90-
var actual = effectiveConfiguration.GetBranchSpecificLabel(ReferenceName.FromBranchName("pull-request"), null, environment);
91+
var effectiveConfiguration = configuration.GetEffectiveConfiguration(ReferenceName.FromBranchName(BranchName));
92+
var actual = effectiveConfiguration.GetBranchSpecificLabel(ReferenceName.FromBranchName(BranchName), null, environment);
9193
actual.ShouldBe("pr-unknown");
9294
}
9395

@@ -132,13 +134,13 @@ public void EnsureGetBranchSpecificLabelThrowsWhenThrowIfNotFoundAndEnvVarMissin
132134

133135
var configuration = GitFlowConfigurationBuilder.New
134136
.WithoutBranches()
135-
.WithBranch("pull-request", builder => builder
137+
.WithBranch(BranchName, builder => builder
136138
.WithLabel("pr-{env:MISSING_VAR}")
137139
.WithRegularExpression(@"^pull[/-]"))
138140
.Build();
139141

140-
var effectiveConfiguration = configuration.GetEffectiveConfiguration(ReferenceName.FromBranchName("pull-request"));
142+
var effectiveConfiguration = configuration.GetEffectiveConfiguration(ReferenceName.FromBranchName(BranchName));
141143
Should.Throw<ArgumentException>(() =>
142-
effectiveConfiguration.GetBranchSpecificLabel(ReferenceName.FromBranchName("pull-request"), null, environment));
144+
effectiveConfiguration.GetBranchSpecificLabel(ReferenceName.FromBranchName(BranchName), null, environment));
143145
}
144146
}

0 commit comments

Comments
 (0)