From 207ffd1e5a3c4281ba8f73ba681ccc7b0e539336 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 16 Feb 2014 09:05:19 -0800 Subject: [PATCH] Fixed root folder integration test --- src/NzbDrone.Api/Config/DownloadClientConfigModule.cs | 4 +++- src/NzbDrone.Api/RootFolders/RootFolderModule.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs b/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs index 16c4dfd3b..31e56685e 100644 --- a/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs +++ b/src/NzbDrone.Api/Config/DownloadClientConfigModule.cs @@ -9,8 +9,10 @@ namespace NzbDrone.Api.Config { public DownloadClientConfigModule(IConfigService configService, RootFolderValidator rootFolderValidator, PathExistsValidator pathExistsValidator) : base(configService) - { + { SharedValidator.RuleFor(c => c.DownloadedEpisodesFolder) + .Cascade(CascadeMode.StopOnFirstFailure) + .IsValidPath() .SetValidator(rootFolderValidator) .SetValidator(pathExistsValidator) .When(c => !String.IsNullOrWhiteSpace(c.DownloadedEpisodesFolder)); diff --git a/src/NzbDrone.Api/RootFolders/RootFolderModule.cs b/src/NzbDrone.Api/RootFolders/RootFolderModule.cs index edcf69fe5..be1c43674 100644 --- a/src/NzbDrone.Api/RootFolders/RootFolderModule.cs +++ b/src/NzbDrone.Api/RootFolders/RootFolderModule.cs @@ -27,7 +27,9 @@ namespace NzbDrone.Api.RootFolders CreateResource = CreateRootFolder; DeleteResource = DeleteFolder; - SharedValidator.RuleFor(c => c.Path).IsValidPath() + SharedValidator.RuleFor(c => c.Path) + .Cascade(CascadeMode.StopOnFirstFailure) + .IsValidPath() .SetValidator(rootFolderValidator) .SetValidator(pathExistsValidator) .SetValidator(droneFactoryValidator);