Merge branch 'markus101'

NzbDrone.Core.Test/DownloadProviderTest.cs

@@ -23,9 +23,11 @@ namespace NzbDrone.Core.Test
             var parseResult = Builder<EpisodeParseResult>.CreateNew()
                 .With(c => c.Quality = new Quality(QualityTypes.DVD, false))
                 .Build();
+
             var episodes = Builder<Episode>.CreateListOfSize(2)
                                             .WhereTheFirst(1).Has(s => s.EpisodeId = 12)
                                             .AndTheNext(1).Has(s => s.EpisodeId = 99)
+                                            .WhereAll().Has(s => s.SeriesId = 5)
                                             .Build();
 
 
@@ -43,16 +45,15 @@ namespace NzbDrone.Core.Test
                 .Returns(sabTitle);
 
             mocker.GetMock<HistoryProvider>()
-                .Setup(s => s.Add(It.Is<History>(h => h.EpisodeId == 12)));
+                .Setup(s => s.Add(It.Is<History>(h => h.EpisodeId == 12 && h.SeriesId == 5)));
             mocker.GetMock<HistoryProvider>()
-                .Setup(s => s.Add(It.Is<History>(h => h.EpisodeId == 99)));
+                .Setup(s => s.Add(It.Is<History>(h => h.EpisodeId == 99 && h.SeriesId == 5)));
 
             mocker.GetMock<EpisodeProvider>()
                 .Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>(), false)).Returns(episodes);
 
             mocker.Resolve<DownloadProvider>().DownloadReport(parseResult);
 
-
             mocker.VerifyAllMocks();
         }
     }

NzbDrone.Core/Providers/DownloadProvider.cs

@@ -48,6 +48,7 @@ namespace NzbDrone.Core.Providers
                     history.Quality = parseResult.Quality.QualityType;
                     history.NzbTitle = parseResult.NzbTitle;
                     history.EpisodeId = episode.EpisodeId;
+                    history.SeriesId = episode.SeriesId;
 
                     _historyProvider.Add(history);
                 }