github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 05:23:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'markus' into kay.one

Browse source 
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
commit 956092dbd4
2 changed files with 4 additions and 3 deletions
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>()))