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

Merge branch 'markus' into kay.one 

Conflicts:
	NzbDrone.Core.Test/ProviderTests/DiskScanProviderTest.cs
	NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests.cs
This commit is contained in:
kay.one 2011-10-22 22:28:59 -07:00
parent fb0b505bf4 a827199902
commit 956092dbd4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTest.cs
View File

@ -26,8 +26,9 @@ namespace NzbDrone.Core.Test.ProviderTests
.Setup(c => c.GetEpisodeBySeries(It.IsAny<long>()))
.Returns(new List<Episode> { new Episode() });
mocker.GetMock<DiskProvider>().Setup(c => c.FolderExists(It.IsAny<string>())).Returns(true);
mocker.GetMock<DiskProvider>()
.Setup(c => c.FolderExists(It.IsAny<string>()))
.Returns(true);
mocker.GetMock<MediaFileProvider>()
.Setup(c => c.GetSeriesFiles(It.IsAny<int>()))

2
NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests.cs
View File

@ -1,4 +1,4 @@
// ReSharper disable RedundantUsingDirective
// ReSharper disable RedundantUsingDirective
using System.Collections.Generic;
using AutoMoq;