Merge branch 'master' of git://github.com/kayone/NzbDrone

Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs
This commit is contained in:
Mark McDowall 2011-06-20 00:16:01 -07:00
commit d416ec0147
18 changed files with 417 additions and 1102 deletions

View file

@ -143,7 +143,7 @@ namespace NzbDrone.Core.Test
series.ShouldHave().AllPropertiesBut(s => s.QualityProfile, s => s.SeriesId).EqualTo(fakeSeries);
series.QualityProfile.Should().NotBeNull();
series.QualityProfile.ShouldHave().Properties(q => q.Name, q => q.SonicAllowed, q => q.Cutoff, q => q.SonicAllowed).EqualTo(fakeQuality);
}
[Test]