Skip to content

Commit 7936230

Browse files
committed
(GH-79) Correctly handle issues to exclude
1 parent 64a9f92 commit 7936230

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
As part of this release we had [5 commits](https://github.com/TestUser/FakeRepository/commits/1.2.3) which resulted in [2 issues](https://github.com/FakeRepository/issues/issues?milestone=0&state=closed) being closed.
2+
3+
4+
__Bug__
5+
6+
- [__#2__](http://example.com/2) Issue 2
7+

Source/GitReleaseManager.Tests/ReleaseNotesBuilderTests.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ public void SomeCommitsWrongIssueLabel()
116116
Assert.Throws<AggregateException>(() => AcceptTest(5, CreateIssue(1, "Test")));
117117
}
118118

119+
[Test]
120+
public void CorrectlyExcludeIssues()
121+
{
122+
AcceptTest(5, CreateIssue(1, "Internal Refactoring"), CreateIssue(2, "Bug"));
123+
}
124+
119125
private static void AcceptTest(int commits, params Issue[] issues)
120126
{
121127
AcceptTest(commits, null, issues);

Source/GitReleaseManager/ReleaseNotesBuilder.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,15 @@ private string GetLabel(string label, Func<LabelAlias, string> func)
110110

111111
private void CheckForValidLabels(Issue issue)
112112
{
113-
var count = this.configuration.IssueLabelsInclude.Sum(issueLabel => issue.Labels.Count(l => l.Name.ToUpperInvariant() == issueLabel.ToUpperInvariant()));
113+
var count = 0;
114+
115+
116+
foreach (var issueLabel in issue.Labels)
117+
{
118+
count += this.configuration.IssueLabelsInclude.Count(issueToInclude => issueLabel.Name.ToUpperInvariant() == issueToInclude.ToUpperInvariant());
119+
120+
count += this.configuration.IssueLabelsExclude.Count(issueToExclude => issueLabel.Name.ToUpperInvariant() == issueToExclude.ToUpperInvariant());
121+
}
114122

115123
if (count != 1)
116124
{

0 commit comments

Comments
 (0)