From 3ebdc1c1ace723d9b0a5095fa0ee81792636c7f9 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Mon, 7 Jun 2021 10:00:53 -0500 Subject: [PATCH] Fixed: Develop branch out of date warning Fixed: Develop branch invalid warning --- .../HealthCheck/Checks/ReleaseBranchCheckFixture.cs | 8 +------- .../HealthCheck/Checks/ReleaseBranchCheck.cs | 6 +----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs index 28e002987..f503d665e 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs @@ -33,14 +33,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks Subject.Check().ShouldBeWarning(); } + [TestCase("Develop")] [TestCase("develop")] - public void should_return_error_when_branch_is_v1(string branch) - { - GivenValidBranch(branch); - - Subject.Check().ShouldBeError(); - } - [TestCase("nightly")] [TestCase("Nightly")] public void should_return_no_warning_when_branch_valid(string branch) diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs index eca2d1fe1..dad54475e 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs @@ -23,11 +23,6 @@ namespace NzbDrone.Core.HealthCheck.Checks if (!Enum.GetNames(typeof(ReleaseBranches)).Any(x => x.ToLower() == currentBranch)) { - if (currentBranch == "develop") - { - return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckPreviousVersionMessage"), _configFileService.Branch), "#branch-is-for-a-previous-version"); - } - return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckOfficialBranchMessage"), _configFileService.Branch), "#branch-is-not-a-valid-release-branch"); } @@ -36,6 +31,7 @@ namespace NzbDrone.Core.HealthCheck.Checks public enum ReleaseBranches { + Develop, Nightly } }