From 30c82f2613ae56eb8434e8c9d8619704aeb69aad Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 28 May 2014 07:15:19 -0700 Subject: [PATCH] Added tests for RootFolderCheck Fixed: Progress bar colour when series is continuing Fixed: Episode Title in tables will show proper cursor and underline --- .../Checks/RootFolderCheckFixture.cs | 54 +++++++++++++++++++ .../HealthCheck/Checks/UpdateCheckFixture.cs | 2 + .../NzbDrone.Core.Test.csproj | 1 + src/UI/Cells/cells.less | 8 +-- src/UI/Handlebars/Helpers/Episode.js | 2 +- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 src/NzbDrone.Core.Test/HealthCheck/Checks/RootFolderCheckFixture.cs diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/RootFolderCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/RootFolderCheckFixture.cs new file mode 100644 index 000000000..668b7fa4c --- /dev/null +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/RootFolderCheckFixture.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using FizzWare.NBuilder; +using Moq; +using NUnit.Framework; +using NzbDrone.Common.Disk; +using NzbDrone.Core.HealthCheck.Checks; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; + +namespace NzbDrone.Core.Test.HealthCheck.Checks +{ + [TestFixture] + public class RootFolderCheckFixture : CoreTest + { + private void GivenMissingRootFolder() + { + var series = Builder.CreateListOfSize(1) + .Build() + .ToList(); + + Mocker.GetMock() + .Setup(s => s.GetAllSeries()) + .Returns(series); + + Mocker.GetMock() + .Setup(s => s.GetParentFolder(series.First().Path)) + .Returns(@"C:\TV"); + + Mocker.GetMock() + .Setup(s => s.FolderExists(It.IsAny())) + .Returns(false); + } + + [Test] + public void should_not_return_error_when_no_series() + { + Mocker.GetMock() + .Setup(s => s.GetAllSeries()) + .Returns(new List()); + + Subject.Check().ShouldBeOk(); + } + + [Test] + public void should_return_error_if_series_parent_is_missing() + { + GivenMissingRootFolder(); + + Subject.Check().ShouldBeError(); + } + } +} diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs index ed48675e4..7e6fd213c 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/UpdateCheckFixture.cs @@ -1,8 +1,10 @@ using System; +using FluentAssertions; using Moq; using NUnit.Framework; using NzbDrone.Common.Disk; using NzbDrone.Common.EnvironmentInfo; +using NzbDrone.Core.HealthCheck; using NzbDrone.Core.HealthCheck.Checks; using NzbDrone.Core.Test.Framework; diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 52e2d0867..82fc19ecc 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -125,6 +125,7 @@ + diff --git a/src/UI/Cells/cells.less b/src/UI/Cells/cells.less index f9eefd46a..4105f32a1 100644 --- a/src/UI/Cells/cells.less +++ b/src/UI/Cells/cells.less @@ -5,11 +5,6 @@ @import "../Content/mixins"; @import "../Content/variables"; -.table { - - //table-layout: fixed; -} - .series-title { .text-overflow(); @@ -24,9 +19,10 @@ color: #428bca; text-decoration: none; - &.focus, &.hover { + &:focus, &:hover { color: #2a6496; text-decoration: underline; + cursor: pointer; } @media @lg { diff --git a/src/UI/Handlebars/Helpers/Episode.js b/src/UI/Handlebars/Helpers/Episode.js index ac4bb4e8a..dbe5ac499 100644 --- a/src/UI/Handlebars/Helpers/Episode.js +++ b/src/UI/Handlebars/Helpers/Episode.js @@ -47,7 +47,7 @@ define( Handlebars.registerHelper('EpisodeProgressClass', function () { if (this.episodeFileCount === this.episodeCount) { - if (this.continuing) { + if (this.status === 'continuing') { return ''; }