Merge branch 'markus' into kay.one
Conflicts: NzbDrone.Core.Test/ProviderTests/DiskScanProviderTest.cs NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests.cs
This commit is contained in:
commit
956092dbd4
|
@ -26,8 +26,9 @@ namespace NzbDrone.Core.Test.ProviderTests
|
||||||
.Setup(c => c.GetEpisodeBySeries(It.IsAny<long>()))
|
.Setup(c => c.GetEpisodeBySeries(It.IsAny<long>()))
|
||||||
.Returns(new List<Episode> { new Episode() });
|
.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>()
|
mocker.GetMock<MediaFileProvider>()
|
||||||
.Setup(c => c.GetSeriesFiles(It.IsAny<int>()))
|
.Setup(c => c.GetSeriesFiles(It.IsAny<int>()))
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// ReSharper disable RedundantUsingDirective
|
// ReSharper disable RedundantUsingDirective
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using AutoMoq;
|
using AutoMoq;
|
||||||
|
|
Loading…
Reference in New Issue