Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed auth tests

This commit is contained in:
Mark McDowall 2013-05-21 21:06:25 -07:00
parent 34e35bd00b
commit f5a68782ce
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Api/NancyBootstrapper.cs
View File

@ -38,7 +38,7 @@ namespace NzbDrone.Api
container.Resolve<DatabaseTarget>().Register(); container.Resolve<DatabaseTarget>().Register();
container.Resolve<IMessageAggregator>().PublishEvent(new ApplicationStartedEvent()); container.Resolve<IMessageAggregator>().PublishEvent(new ApplicationStartedEvent());
if (container.Resolve<IConfigFileProvider>().AuthenticationType == AuthenticationType.Basic) if (container.Resolve<IConfigFileProvider>().AuthenticationType == AuthenticationType.Basic)
{ {
pipelines.EnableBasicAuthentication(new BasicAuthenticationConfiguration( pipelines.EnableBasicAuthentication(new BasicAuthenticationConfiguration(

16
NzbDrone.Common.Test/ConfigFileProviderTest.cs
View File

@ -127,25 +127,19 @@ namespace NzbDrone.Common.Test
[Test] [Test]
public void GetAuthenticationType_No_Existing_Value() public void GetAuthenticationType_No_Existing_Value()
{ {
var result = Subject.AuthenticationType; var result = Subject.AuthenticationType;
result.Should().Be(AuthenticationType.Anonymous); result.Should().Be(AuthenticationType.Anonymous);
} }
[Test] [Test]
public void GetAuthenticationType_Windows() public void GetAuthenticationType_Basic()
{ {
Subject.SetValue("AuthenticationType", AuthenticationType.Basic);
Subject.SetValue("AuthenticationType", 1);
var result = Subject.AuthenticationType; var result = Subject.AuthenticationType;
result.Should().Be(AuthenticationType.Basic);
result.Should().Be(AuthenticationType.Windows);
} }
[Test] [Test]

6
NzbDrone.Common/IConfigFileProvider.cs
View File

@ -17,6 +17,7 @@ namespace NzbDrone.Common
int GetValueInt(string key, int defaultValue); int GetValueInt(string key, int defaultValue);
bool GetValueBoolean(string key, bool defaultValue); bool GetValueBoolean(string key, bool defaultValue);
string GetValue(string key, object defaultValue); string GetValue(string key, object defaultValue);
T GetValueEnum<T>(string key, T defaultValue);
void SetValue(string key, object value); void SetValue(string key, object value);
} }
@ -88,7 +89,7 @@ namespace NzbDrone.Common
return Convert.ToBoolean(GetValue(key, defaultValue)); return Convert.ToBoolean(GetValue(key, defaultValue));
} }
private T GetValueEnum<T>(string key, T defaultValue) public T GetValueEnum<T>(string key, T defaultValue)
{ {
return (T)Enum.Parse(typeof(T), GetValue(key, defaultValue), true); return (T)Enum.Parse(typeof(T), GetValue(key, defaultValue), true);
} }
@ -100,7 +101,6 @@ namespace NzbDrone.Common
var parentContainer = config; var parentContainer = config;
var valueHolder = parentContainer.Descendants(key).ToList(); var valueHolder = parentContainer.Descendants(key).ToList();
if (valueHolder.Count() == 1) if (valueHolder.Count() == 1)
@ -131,7 +131,7 @@ namespace NzbDrone.Common
xDoc.Save(_configFile); xDoc.Save(_configFile);
} }
private void SetValue(string key, Enum value) public void SetValue(string key, Enum value)
{ {
SetValue(key, value.ToString().ToLower()); SetValue(key, value.ToString().ToLower());
} }