fixed newznab validation when URL is null.

This commit is contained in:
kayone 2013-12-02 14:11:17 -08:00
parent 44abb6fae8
commit 02c68bd387
2 changed files with 24 additions and 1 deletions

View File

@ -24,6 +24,24 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
} }
[TestCase("")]
[TestCase(" ")]
[TestCase(null)]
public void invalid_url_should_not_apikey(string url)
{
var setting = new NewznabSettings
{
ApiKey = "",
Url = url
};
setting.Validate().IsValid.Should().BeFalse();
setting.Validate().Errors.Should().NotContain(c => c.PropertyName == "ApiKey");
setting.Validate().Errors.Should().Contain(c => c.PropertyName == "Url");
}
[TestCase("http://nzbs2.org")] [TestCase("http://nzbs2.org")]
public void doesnt_requires_apikey(string url) public void doesnt_requires_apikey(string url)

View File

@ -23,6 +23,11 @@ namespace NzbDrone.Core.Indexers.Newznab
private static bool ShouldHaveApiKey(NewznabSettings settings) private static bool ShouldHaveApiKey(NewznabSettings settings)
{ {
if (settings.Url == null)
{
return false;
}
return ApiKeyWhiteList.Any(c => settings.Url.ToLowerInvariant().Contains(c)); return ApiKeyWhiteList.Any(c => settings.Url.ToLowerInvariant().Contains(c));
} }