mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed local integration tests.

This commit is contained in:
kayone 2013-11-10 20:48:24 -08:00
parent 1f37597b6f
commit 6e792c6916
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/NzbDrone.Integration.Test/NzbDroneRunner.cs
View File

@ -5,7 +5,6 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Xml.Linq; using System.Xml.Linq;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Processes; using NzbDrone.Common.Processes;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
@ -41,8 +40,7 @@ namespace NzbDrone.Integration.Test
if (BuildInfo.IsDebug) if (BuildInfo.IsDebug)
{ {
Start("..\\..\\..\\..\\..\\_output\\NzbDrone.Console.exe");
Start("..\\..\\..\\..\\_output\\NzbDrone.Console.exe");
} }
else else
{ {
@ -58,7 +56,7 @@ namespace NzbDrone.Integration.Test
Assert.Fail("Process has exited"); Assert.Fail("Process has exited");
} }
SetApiKey(); ApiKey = GetApiKey();
var request = new RestRequest("system/status"); var request = new RestRequest("system/status");
request.AddHeader("Authorization", ApiKey); request.AddHeader("Authorization", ApiKey);
@ -100,16 +98,16 @@ namespace NzbDrone.Integration.Test
} }
} }
private void SetApiKey() private string GetApiKey()
{ {
var configFile = Path.Combine(AppData, "config.xml"); var configFile = Path.Combine(AppData, "config.xml");
if (!String.IsNullOrWhiteSpace(ApiKey)) return; if (!String.IsNullOrWhiteSpace(ApiKey)) return ApiKey;
if (!File.Exists(configFile)) return; if (!File.Exists(configFile)) return null;
var xDoc = XDocument.Load(configFile); var xDoc = XDocument.Load(configFile);
var config = xDoc.Descendants(ConfigFileProvider.CONFIG_ELEMENT_NAME).Single(); var config = xDoc.Descendants(ConfigFileProvider.CONFIG_ELEMENT_NAME).Single();
ApiKey = config.Descendants("ApiKey").Single().Value; return config.Descendants("ApiKey").Single().Value;
} }
} }
} }

1
src/UI/Navbar/NavbarView.js
View File

@ -2,7 +2,6 @@
define( define(
[ [
'marionette', 'marionette',
'Navbar/Search',
'jquery' 'jquery'
], function (Marionette, $) { ], function (Marionette, $) {
return Marionette.ItemView.extend({ return Marionette.ItemView.extend({