diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs index 043db1513..d65350e62 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs @@ -343,40 +343,19 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests result.OutputPath.Should().Be(@"O:\mymount\Droned.S01E01.Pilot.1080p.WEB-DL-DRONE".AsOsAgnostic()); } - [Test] - public void should_pass_test_if_version_high_enough() - { - Mocker.GetMock() - .Setup(v => v.GetVersion(It.IsAny())) - .Returns("12.0"); - - var error = Subject.Test(); - - error.IsValid.Should().BeTrue(); - } - - [Test] - public void should_fail_test_if_version_too_low() - { - Mocker.GetMock() - .Setup(v => v.GetVersion(It.IsAny())) - .Returns("11.0"); - - var error = Subject.Test(); - - error.IsValid.Should().BeFalse(); - } - - [Test] - public void should_ignore_version_test_if_development_version() + [TestCase("11.0", false)] + [TestCase("12.0", true)] + [TestCase("11.0-b30ef0134", false)] + [TestCase("13.0-b30ef0134", true)] + public void should_test_version(string version, bool expected) { Mocker.GetMock() .Setup(v => v.GetVersion(It.IsAny())) - .Returns("12.0-dev"); + .Returns(version); var error = Subject.Test(); - error.IsValid.Should().BeTrue(); + error.IsValid.Should().Be(expected); } } } diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs index 7f54492f6..bcb27ea13 100644 --- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs +++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs @@ -258,9 +258,9 @@ namespace NzbDrone.Core.Download.Clients.Nzbget { try { - var version = _proxy.GetVersion(Settings); + var version = _proxy.GetVersion(Settings).Split('-')[0]; - if (!version.Contains('-') && Version.Parse(version) < Version.Parse("12.0")) + if (Version.Parse(version) < Version.Parse("12.0")) { return new ValidationFailure(string.Empty, "Nzbget version too low, need 12.0 or higher"); }